[Scummvm-cvs-logs] SF.net SVN: scummvm:[39893] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 39893
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39893&view=rev
Author:   drmccoy
Date:     2009-04-07 16:53:38 +0000 (Tue, 07 Apr 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/gob/parse.cpp
    scummvm/trunk/engines/gob/parse.h
    scummvm/trunk/engines/gob/parse_v2.cpp

Modified: scummvm/trunk/engines/gob/parse.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse.cpp	2009-04-07 15:05:53 UTC (rev 39892)
+++ scummvm/trunk/engines/gob/parse.cpp	2009-04-07 16:53:38 UTC (rev 39893)
@@ -93,8 +93,8 @@
 					_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 @@
 			// 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;
 

Modified: scummvm/trunk/engines/gob/parse.h
===================================================================
--- scummvm/trunk/engines/gob/parse.h	2009-04-07 15:05:53 UTC (rev 39892)
+++ scummvm/trunk/engines/gob/parse.h	2009-04-07 16:53:38 UTC (rev 39893)
@@ -46,13 +46,8 @@
 
 	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,

Modified: scummvm/trunk/engines/gob/parse_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse_v2.cpp	2009-04-07 15:05:53 UTC (rev 39892)
+++ scummvm/trunk/engines/gob/parse_v2.cpp	2009-04-07 16:53:38 UTC (rev 39893)
@@ -139,10 +139,10 @@
 		}
 		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 @@
 				}
 				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 @@
 				}
 				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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.