[Scummvm-cvs-logs] SF.net SVN: scummvm:[41574] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jun 16 01:11:08 CEST 2009
Revision: 41574
http://scummvm.svn.sourceforge.net/scummvm/?rev=41574&view=rev
Author: drmccoy
Date: 2009-06-15 23:11:08 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
Renaming _inter_resVal to _resultInt
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
scummvm/trunk/engines/gob/parse.cpp
scummvm/trunk/engines/gob/parse.h
Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/inter.cpp 2009-06-15 23:11:08 UTC (rev 41574)
@@ -100,7 +100,7 @@
switch (type) {
case TYPE_IMM_INT16:
- *pRes = _vm->_parse->_inter_resVal;
+ *pRes = _vm->_parse->_resultInt;
break;
case TYPE_IMM_STR:
@@ -123,7 +123,7 @@
_vm->_parse->parseExpr(99, &type);
if ( (type == GOB_TRUE) ||
- ((type == TYPE_IMM_INT16) && _vm->_parse->_inter_resVal))
+ ((type == TYPE_IMM_INT16) && _vm->_parse->_resultInt))
return true;
else
return false;
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-15 23:11:08 UTC (rev 41574)
@@ -738,7 +738,7 @@
if (_terminate)
return;
- if (_vm->_parse->_inter_resVal == value) {
+ if (_vm->_parse->_resultInt == value) {
found = true;
notFound = false;
}
@@ -1332,7 +1332,7 @@
switch (destType) {
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest, _vm->_parse->_inter_resVal);
+ WRITE_VAR_OFFSET(dest, _vm->_parse->_resultInt);
break;
case TYPE_VAR_STR:
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-15 23:11:08 UTC (rev 41574)
@@ -760,7 +760,7 @@
default:
if (!found) {
evalExpr(0);
- if (value == _vm->_parse->_inter_resVal)
+ if (value == _vm->_parse->_resultInt)
found = true;
} else
_vm->_parse->skipExpr(99);
@@ -1168,9 +1168,9 @@
} else {
if (evalExpr(&varOff) != 20)
- _vm->_parse->_inter_resVal = 0;
+ _vm->_parse->_resultInt = 0;
- memcpy(_varStack + _varStackPos, &_vm->_parse->_inter_resVal, 4);
+ memcpy(_varStack + _varStackPos, &_vm->_parse->_resultInt, 4);
_varStackPos += 4;
_varStack[_varStackPos] = 4;
}
@@ -1606,21 +1606,21 @@
switch (destType) {
case TYPE_VAR_INT8:
case TYPE_ARRAY_INT8:
- WRITE_VARO_UINT8(dest + i, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT16:
case TYPE_ARRAY_INT16:
- WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_inter_resVal);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT32_AS_INT16:
- WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
break;
case TYPE_VAR_STR:
@@ -1897,7 +1897,7 @@
dataVar = _vm->_parse->parseVarIndex();
size = _vm->_parse->parseValExpr();
evalExpr(0);
- offset = _vm->_parse->_inter_resVal;
+ offset = _vm->_parse->_resultInt;
retSize = 0;
debugC(2, kDebugFileIO, "Read from file \"%s\" (%d, %d bytes at %d)",
@@ -1968,7 +1968,7 @@
dataVar = _vm->_parse->parseVarIndex();
size = _vm->_parse->parseValExpr();
evalExpr(0);
- offset = _vm->_parse->_inter_resVal;
+ offset = _vm->_parse->_resultInt;
debugC(2, kDebugFileIO, "Write to file \"%s\" (%d, %d bytes at %d)",
_vm->_parse->_inter_resStr, dataVar, size, offset);
Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-15 23:11:08 UTC (rev 41574)
@@ -890,21 +890,21 @@
switch (destType) {
case TYPE_VAR_INT8:
case TYPE_ARRAY_INT8:
- WRITE_VARO_UINT8(dest + i, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT16:
case TYPE_ARRAY_INT16:
- WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_inter_resVal);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
break;
case TYPE_VAR_INT32_AS_INT16:
- WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_inter_resVal);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
break;
case TYPE_VAR_STR:
@@ -979,8 +979,8 @@
evalExpr(0);
- _vm->_draw->_backColor = _vm->_parse->_inter_resVal & 0xFFFF;
- uint16 extraVar = _vm->_parse->_inter_resVal >> 16;
+ _vm->_draw->_backColor = _vm->_parse->_resultInt & 0xFFFF;
+ uint16 extraVar = _vm->_parse->_resultInt >> 16;
if (extraVar != 0)
warning("Urban Stub: o6_fillRect(), extraVar = %d", extraVar);
Modified: scummvm/trunk/engines/gob/parse.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse.cpp 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/parse.cpp 2009-06-15 23:11:08 UTC (rev 41574)
@@ -35,7 +35,7 @@
Parse::Parse(GobEngine *vm) : _vm(vm) {
_inter_resStr[0] = 0;
- _inter_resVal = 0;
+ _resultInt = 0;
}
int32 Parse::encodePtr(byte *ptr, int type) {
@@ -623,7 +623,7 @@
int16 Parse::parseValExpr(byte stopToken) {
parseExpr(stopToken, 0);
- return _vm->_parse->_inter_resVal;
+ return _vm->_parse->_resultInt;
}
// Load a value according to the operation
@@ -742,29 +742,29 @@
do {
prevPrevVal = prevVal;
prevVal = curVal;
- curVal = (curVal + _vm->_parse->_inter_resVal / curVal) / 2;
+ curVal = (curVal + _vm->_parse->_resultInt / curVal) / 2;
} while ((curVal != prevVal) && (curVal != prevPrevVal));
- _vm->_parse->_inter_resVal = curVal;
+ _vm->_parse->_resultInt = curVal;
break;
case FUNC_SQR:
- _vm->_parse->_inter_resVal =
- _vm->_parse->_inter_resVal * _vm->_parse->_inter_resVal;
+ _vm->_parse->_resultInt =
+ _vm->_parse->_resultInt * _vm->_parse->_resultInt;
break;
case FUNC_ABS:
- if (_vm->_parse->_inter_resVal < 0)
- _vm->_parse->_inter_resVal = -_vm->_parse->_inter_resVal;
+ if (_vm->_parse->_resultInt < 0)
+ _vm->_parse->_resultInt = -_vm->_parse->_resultInt;
break;
case FUNC_RAND:
- _vm->_parse->_inter_resVal =
- _vm->_util->getRandom(_vm->_parse->_inter_resVal);
+ _vm->_parse->_resultInt =
+ _vm->_util->getRandom(_vm->_parse->_resultInt);
break;
}
*operPtr = OP_LOAD_IMM_INT16;
- *valPtr = _vm->_parse->_inter_resVal;
+ *valPtr = _vm->_parse->_resultInt;
break;
}
}
@@ -1008,7 +1008,7 @@
break;
case OP_LOAD_IMM_INT16:
- _vm->_parse->_inter_resVal = value;
+ _vm->_parse->_resultInt = value;
break;
case OP_LOAD_IMM_STR:
@@ -1021,7 +1021,7 @@
break;
default:
- _vm->_parse->_inter_resVal = 0;
+ _vm->_parse->_resultInt = 0;
if (type != 0)
*type = OP_LOAD_IMM_INT16;
break;
Modified: scummvm/trunk/engines/gob/parse.h
===================================================================
--- scummvm/trunk/engines/gob/parse.h 2009-06-15 23:10:51 UTC (rev 41573)
+++ scummvm/trunk/engines/gob/parse.h 2009-06-15 23:11:08 UTC (rev 41574)
@@ -119,7 +119,7 @@
virtual ~Parse() {}
char _inter_resStr[200];
- int32 _inter_resVal;
+ int32 _resultInt;
private:
enum PointerType {
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