Use KeyActionId values wherever possible. Add some further value checks. Assign this.mouseAction properly.

This commit is contained in:
László Monda
2016-03-30 12:31:53 +02:00
parent 17e56fdf7c
commit 5bd6c0a8a0
6 changed files with 26 additions and 21 deletions

View File

@@ -1,25 +1,24 @@
class NoneAction extends KeyAction implements Serializable<NoneAction> {
static keyActionTypeString = 'none';
static keyActionId = 0;
static keyActionNoneParam = 0;
static noneActionParam = 0;
fromJsObject(jsObject: any): NoneAction {
if (jsObject.keyActionType !== NoneAction.keyActionTypeString) {
throw 'Invalid KeyActionNone.keyActionType: "${jsObject.keyActionType}"';
throw 'Invalid NoneAction.keyActionType: "${jsObject.keyActionType}"';
}
return this;
}
fromBinary(buffer: UhkBuffer): NoneAction {
let keyActionId = buffer.readUInt8();
if (keyActionId !== NoneAction.keyActionId) {
throw 'Invalid KeyActionNone.id: ${keyActionId}';
if (keyActionId !== KeyActionId.NoneAction) {
throw 'Invalid NoneAction.id: ${keyActionId}';
}
let keyActionParam = buffer.readUInt8();
if (keyActionParam !== NoneAction.keyActionNoneParam) {
throw 'Invalid KeyActionNone.param: ${keyActionParam}';
if (keyActionParam !== NoneAction.noneActionParam) {
throw 'Invalid NoneAction.param: ${keyActionParam}';
}
return this;
@@ -32,7 +31,7 @@ class NoneAction extends KeyAction implements Serializable<NoneAction> {
}
toBinary(buffer: UhkBuffer) {
buffer.writeUInt8(NoneAction.keyActionId);
buffer.writeUInt8(NoneAction.keyActionNoneParam);
buffer.writeUInt8(KeyActionId.NoneAction);
buffer.writeUInt8(NoneAction.noneActionParam);
}
}