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

[drmccoy at users.sourceforge.net]

Revision: 41569
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41569&view=rev
Author:   drmccoy
Date:     2009-06-15 23:09:37 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Renaming some variables in o1_assign() and o2_assign() to mirror the structure in o6_assign()

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter_v1.cpp
    scummvm/trunk/engines/gob/inter_v2.cpp

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2009-06-15 23:09:23 UTC (rev 41568)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2009-06-15 23:09:37 UTC (rev 41569)
@@ -1323,13 +1323,13 @@
 }
 
 bool Inter_v1::o1_assign(OpFuncParams &params) {
-	byte *savedPos = _vm->_global->_inter_execPtr;
+	byte destType = *_vm->_global->_inter_execPtr;
 	int16 dest = _vm->_parse->parseVarIndex();
 
 	int16 result;
-	int16 type = evalExpr(&result);
+	int16 srcType = evalExpr(&result);
 
-	switch (savedPos[0]) {
+	switch (destType) {
 	case TYPE_VAR_INT32:
 	case TYPE_ARRAY_INT32:
 		WRITE_VAR_OFFSET(dest, _vm->_global->_inter_resVal);
@@ -1337,7 +1337,7 @@
 
 	case TYPE_VAR_STR:
 	case TYPE_ARRAY_STR:
-		if (type == TYPE_IMM_INT16)
+		if (srcType == TYPE_IMM_INT16)
 			WRITE_VARO_UINT8(dest, result);
 		else
 			WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2009-06-15 23:09:23 UTC (rev 41568)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2009-06-15 23:09:37 UTC (rev 41569)
@@ -1589,7 +1589,7 @@
 }
 
 bool Inter_v2::o2_assign(OpFuncParams &params) {
-	byte *savedPos = _vm->_global->_inter_execPtr;
+	byte destType = *_vm->_global->_inter_execPtr;
 	int16 dest = _vm->_parse->parseVarIndex();
 
 	byte loopCount;
@@ -1601,9 +1601,9 @@
 
 	for (int i = 0; i < loopCount; i++) {
 		int16 result;
-		int16 type = evalExpr(&result);
+		int16 srcType = evalExpr(&result);
 
-		switch (savedPos[0]) {
+		switch (destType) {
 		case TYPE_VAR_INT8:
 		case TYPE_ARRAY_INT8:
 			WRITE_VARO_UINT8(dest + i, _vm->_global->_inter_resVal);
@@ -1625,7 +1625,7 @@
 
 		case TYPE_VAR_STR:
 		case TYPE_ARRAY_STR:
-			if (type == TYPE_IMM_INT16)
+			if (srcType == TYPE_IMM_INT16)
 				WRITE_VARO_UINT8(dest, result);
 			else
 				WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);


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