[Scummvm-cvs-logs] SF.net SVN: scummvm:[41565] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jun 16 01:08:28 CEST 2009
Revision: 41565
http://scummvm.svn.sourceforge.net/scummvm/?rev=41565&view=rev
Author: drmccoy
Date: 2009-06-15 23:08:28 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Propagating variable name changes
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter.cpp
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/gob/inter_v6.cpp
Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:08:09 UTC (rev 41564)
+++ scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:08:28 UTC (rev 41565)
@@ -90,15 +90,15 @@
}
char Inter::evalExpr(int16 *pRes) {
- byte token;
+ byte type;
_vm->_parse->printExpr(99);
- _vm->_parse->parseExpr(99, &token);
+ _vm->_parse->parseExpr(99, &type);
if (!pRes)
- return token;
+ return type;
- switch (token) {
+ switch (type) {
case 20:
*pRes = _vm->_global->_inter_resVal;
break;
@@ -113,16 +113,16 @@
break;
}
- return token;
+ return type;
}
bool Inter::evalBoolResult() {
- byte token;
+ byte type;
_vm->_parse->printExpr(99);
- _vm->_parse->parseExpr(99, &token);
- if ((token == 24) || ((token == 20) && _vm->_global->_inter_resVal))
+ _vm->_parse->parseExpr(99, &type);
+ if ((type == 24) || ((type == 20) && _vm->_global->_inter_resVal))
return true;
else
return false;
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:08:09 UTC (rev 41564)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:08:28 UTC (rev 41565)
@@ -1323,26 +1323,24 @@
}
bool Inter_v1::o1_assign(OpFuncParams ¶ms) {
- byte *savedPos;
- int16 token;
+ byte *savedPos = _vm->_global->_inter_execPtr;
+ int16 dest = _vm->_parse->parseVarIndex();
+
int16 result;
- int16 varOff;
+ int16 type = evalExpr(&result);
- savedPos = _vm->_global->_inter_execPtr;
- varOff = _vm->_parse->parseVarIndex();
- token = evalExpr(&result);
switch (savedPos[0]) {
case 23:
case 26:
- WRITE_VAR_OFFSET(varOff, _vm->_global->_inter_resVal);
+ WRITE_VAR_OFFSET(dest, _vm->_global->_inter_resVal);
break;
case 25:
case 28:
- if (token == 20)
- WRITE_VARO_UINT8(varOff, result);
+ if (type == 20)
+ WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(varOff, _vm->_global->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
break;
}
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:08:09 UTC (rev 41564)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:08:28 UTC (rev 41565)
@@ -1589,15 +1589,10 @@
}
bool Inter_v2::o2_assign(OpFuncParams ¶ms) {
- byte *savedPos;
- int16 varOff;
- int16 token;
- int16 result;
- byte loopCount;
+ byte *savedPos = _vm->_global->_inter_execPtr;
+ int16 dest = _vm->_parse->parseVarIndex();
- savedPos = _vm->_global->_inter_execPtr;
- varOff = _vm->_parse->parseVarIndex();
-
+ byte loopCount;
if (*_vm->_global->_inter_execPtr == 99) {
_vm->_global->_inter_execPtr++;
loopCount = *_vm->_global->_inter_execPtr++;
@@ -1605,33 +1600,35 @@
loopCount = 1;
for (int i = 0; i < loopCount; i++) {
- token = evalExpr(&result);
+ int16 result;
+ int16 type = evalExpr(&result);
+
switch (savedPos[0]) {
case 16:
case 18:
- WRITE_VARO_UINT8(varOff + i, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT8(dest + i, _vm->_global->_inter_resVal);
break;
case 17:
case 27:
- WRITE_VARO_UINT16(varOff + i * 2, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_global->_inter_resVal);
break;
case 23:
case 26:
- WRITE_VAR_OFFSET(varOff + i * 4, _vm->_global->_inter_resVal);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_global->_inter_resVal);
break;
case 24:
- WRITE_VARO_UINT16(varOff + i * 4, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_global->_inter_resVal);
break;
case 25:
case 28:
- if (token == 20)
- WRITE_VARO_UINT8(varOff, result);
+ if (type == 20)
+ WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(varOff, _vm->_global->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
break;
}
}
Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:08:09 UTC (rev 41564)
+++ scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:08:28 UTC (rev 41565)
@@ -841,31 +841,27 @@
}
bool Inter_v6::o6_assign(OpFuncParams ¶ms) {
- byte *savedPos;
- int16 varOff;
- int16 token;
- int16 result;
- byte loopCount;
- uint16 var_6, var_A;
+ uint16 size, destType;
+ int16 dest = _vm->_parse->parseVarIndex(&size, &destType);
- varOff = _vm->_parse->parseVarIndex(&var_6, &var_A);
+ if (size != 0) {
+ int16 src;
- if (var_6 != 0) {
- int16 var_4;
+ byte *savedPos = _vm->_global->_inter_execPtr;
- savedPos = _vm->_global->_inter_execPtr;
+ src = _vm->_parse->parseVarIndex(&size, 0);
- var_4 = _vm->_parse->parseVarIndex(&var_6, 0);
+ memcpy(_vm->_inter->_variables->getAddressOff8(dest),
+ _vm->_inter->_variables->getAddressOff8(src), size * 4);
- memcpy(_vm->_inter->_variables->getAddressOff8(varOff),
- _vm->_inter->_variables->getAddressOff8(var_4), var_6 * 4);
-
_vm->_global->_inter_execPtr = savedPos;
- evalExpr(&var_4);
+ evalExpr(&src);
+
return false;
}
+ byte loopCount;
if (*_vm->_global->_inter_execPtr == 98) {
_vm->_global->_inter_execPtr++;
loopCount = *_vm->_global->_inter_execPtr++;
@@ -874,9 +870,9 @@
uint8 c = *_vm->_global->_inter_execPtr++;
uint16 n = load16();
- memset(_vm->_inter->_variables->getAddressOff8(varOff), c, n);
+ memset(_vm->_inter->_variables->getAddressOff8(dest), c, n);
- varOff += n;
+ dest += n;
}
return false;
@@ -888,33 +884,35 @@
loopCount = 1;
for (int i = 0; i < loopCount; i++) {
- token = evalExpr(&result);
- switch (var_A) {
+ int16 result;
+ int16 srcType = evalExpr(&result);
+
+ switch (destType) {
case 16:
case 18:
- WRITE_VARO_UINT8(varOff + i, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT8(dest + i, _vm->_global->_inter_resVal);
break;
case 17:
case 27:
- WRITE_VARO_UINT16(varOff + i * 2, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_global->_inter_resVal);
break;
case 23:
case 26:
- WRITE_VAR_OFFSET(varOff + i * 4, _vm->_global->_inter_resVal);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_global->_inter_resVal);
break;
case 24:
- WRITE_VARO_UINT16(varOff + i * 4, _vm->_global->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_global->_inter_resVal);
break;
case 25:
case 28:
- if (token == 20)
- WRITE_VARO_UINT8(varOff, result);
+ if (srcType == 20)
+ WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(varOff, _vm->_global->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_global->_inter_resStr);
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list