Fixing the parser-related FIXMEs. 17 and 18 are int16 and int8, respectively

svn-id: r39893

3 files changed, 12 insertions, 17 deletions

diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp
index 50eec0f406..6f9e86c2d5 100644
--- a/engines/gob/parse.cpp
+++ b/engines/gob/parse.cpp
@@ -93,8 +93,8 @@ void Parse::skipExpr(char stopToken) {
 					_vm->_global->_inter_execPtr++;
 				break;
 
-			case 17:
-			case 18:
+			case OP_LOAD_VAR_INT16:
+			case OP_LOAD_VAR_INT8:
 			case OP_LOAD_IMM_INT16:
 			case 23:
 			case 24:
@@ -198,11 +198,11 @@ void Parse::printExpr_internal(char stopToken) {
 			// operands
 
 			switch (operation) {
-			case 17: // uint16 variable load
+			case OP_LOAD_VAR_INT16: // int16 variable load
 				debugN(5, "var16_%d", _vm->_inter->load16());
 				break;
 
-			case 18: // uint8 variable load:
+			case OP_LOAD_VAR_INT8: // int8 variable load:
 				debugN(5, "var8_%d", _vm->_inter->load16());
 				break;
 
diff --git a/engines/gob/parse.h b/engines/gob/parse.h
index 689ef06eae..feafbaa455 100644
--- a/engines/gob/parse.h
+++ b/engines/gob/parse.h
@@ -46,13 +46,8 @@ enum {
 
 	OP_ARRAY_UINT8 = 16,
 
-	// FIXME: OP_LOAD_VAR_UINT16 comment says "uint16 variable load" in
-	// Parse::printExpr_internal, and does that in Parse_v2::parseExpr,
-	// but reads int8 in Parse_v2::parseValExpr
-	OP_LOAD_VAR_UINT16 = 17,
-	// FIXME: OP_LOAD_VAR_UINT8 comment says "uint8 variable load" in
-	// Parse::printExpr_internal, but reads int8 in Parse_v2::parseValExpr
-	OP_LOAD_VAR_UINT8 = 18,
+	OP_LOAD_VAR_INT16 = 17,
+	OP_LOAD_VAR_INT8 = 18,
 	OP_LOAD_IMM_INT32 = 19,
 	OP_LOAD_IMM_INT16 = 20,
 	OP_LOAD_IMM_INT8 = 21,
diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp
index 87ad486c93..8f6075fb6c 100644
--- a/engines/gob/parse_v2.cpp
+++ b/engines/gob/parse_v2.cpp
@@ -139,10 +139,10 @@ int16 Parse_v2::parseVarIndex(uint16 *arg_0, uint16 *arg_4) {
 		}
 		return varPos + offset * _vm->_global->_inter_animDataSize + temp;
 
-	case 17:
+	case OP_LOAD_VAR_INT16:
 		return varPos + _vm->_inter->load16() * 2;
 
-	case 18:
+	case OP_LOAD_VAR_INT8:
 		return varPos + _vm->_inter->load16();
 
 	case 23:
@@ -267,11 +267,11 @@ int16 Parse_v2::parseValExpr(byte stopToken) {
 				}
 				break;
 
-			case 17:
+			case OP_LOAD_VAR_INT16:
 				*valPtr = READ_VARO_UINT16(varPos + _vm->_inter->load16() * 2);
 				break;
 
-			case 18:
+			case OP_LOAD_VAR_INT8:
 				*valPtr = (int8) READ_VARO_UINT8(varPos + _vm->_inter->load16());
 				break;
 
@@ -566,12 +566,12 @@ int16 Parse_v2::parseExpr(byte stopToken, byte *arg_2) {
 				}
 				break;
 
-			case 17:
+			case OP_LOAD_VAR_INT16:
 				*operPtr = OP_LOAD_IMM_INT16;
 				*valPtr = (int16) READ_VARO_UINT16(varPos + _vm->_inter->load16() * 2);
 				break;
 
-			case 18:
+			case OP_LOAD_VAR_INT8:
 				*operPtr = OP_LOAD_IMM_INT16;
 				*valPtr = (int8) READ_VARO_UINT8(varPos + _vm->_inter->load16());
 				break;