[Scummvm-cvs-logs] SF.net SVN: scummvm:[41750] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Mon Jun 22 12:11:25 CEST 2009
Revision: 41750
http://scummvm.svn.sourceforge.net/scummvm/?rev=41750&view=rev
Author: drmccoy
Date: 2009-06-22 10:11:25 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Encapsulated access to Parse::_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-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/inter.cpp 2009-06-22 10:11:25 UTC (rev 41750)
@@ -173,7 +173,7 @@
switch (type) {
case TYPE_IMM_INT16:
- *pRes = _vm->_parse->_resultInt;
+ *pRes = _vm->_parse->getResultInt();
break;
case TYPE_IMM_STR:
@@ -196,7 +196,7 @@
_vm->_parse->parseExpr(99, &type);
if ( (type == GOB_TRUE) ||
- ((type == TYPE_IMM_INT16) && _vm->_parse->_resultInt))
+ ((type == TYPE_IMM_INT16) && _vm->_parse->getResultInt()))
return true;
else
return false;
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-06-22 10:11:25 UTC (rev 41750)
@@ -258,7 +258,7 @@
if (_terminate)
return;
- if (_vm->_parse->_resultInt == value) {
+ if (_vm->_parse->getResultInt() == value) {
found = true;
notFound = false;
}
@@ -852,7 +852,7 @@
switch (destType) {
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest, _vm->_parse->_resultInt);
+ WRITE_VAR_OFFSET(dest, _vm->_parse->getResultInt());
break;
case TYPE_VAR_STR:
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2009-06-22 10:11:25 UTC (rev 41750)
@@ -213,7 +213,7 @@
default:
if (!found) {
evalExpr(0);
- if (value == _vm->_parse->_resultInt)
+ if (value == _vm->_parse->getResultInt())
found = true;
} else
_vm->_parse->skipExpr(99);
@@ -620,10 +620,12 @@
_varStack[_varStackPos] = _vm->_global->_inter_animDataSize * 4;
} else {
+ int32 n = _vm->_parse->getResultInt();
+
if (evalExpr(&varOff) != 20)
- _vm->_parse->_resultInt = 0;
+ n = 0;
- memcpy(_varStack + _varStackPos, &_vm->_parse->_resultInt, 4);
+ memcpy(_varStack + _varStackPos, &n, 4);
_varStackPos += 4;
_varStack[_varStackPos] = 4;
}
@@ -1059,21 +1061,21 @@
switch (destType) {
case TYPE_VAR_INT8:
case TYPE_ARRAY_INT8:
- WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT8(dest + i, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT16:
case TYPE_ARRAY_INT16:
- WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT32_AS_INT16:
- WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->getResultInt());
break;
case TYPE_VAR_STR:
@@ -1352,7 +1354,7 @@
dataVar = _vm->_parse->parseVarIndex();
size = _vm->_parse->parseValExpr();
evalExpr(0);
- offset = _vm->_parse->_resultInt;
+ offset = _vm->_parse->getResultInt();
retSize = 0;
debugC(2, kDebugFileIO, "Read from file \"%s\" (%d, %d bytes at %d)",
@@ -1423,7 +1425,7 @@
dataVar = _vm->_parse->parseVarIndex();
size = _vm->_parse->parseValExpr();
evalExpr(0);
- offset = _vm->_parse->_resultInt;
+ offset = _vm->_parse->getResultInt();
debugC(2, kDebugFileIO, "Write to file \"%s\" (%d, %d bytes at %d)",
_vm->_parse->_resultStr, dataVar, size, offset);
Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/inter_v6.cpp 2009-06-22 10:11:25 UTC (rev 41750)
@@ -305,21 +305,21 @@
switch (destType) {
case TYPE_VAR_INT8:
case TYPE_ARRAY_INT8:
- WRITE_VARO_UINT8(dest + i, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT8(dest + i, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT16:
case TYPE_ARRAY_INT16:
- WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT16(dest + i * 2, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT32:
case TYPE_ARRAY_INT32:
- WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->_resultInt);
+ WRITE_VAR_OFFSET(dest + i * 4, _vm->_parse->getResultInt());
break;
case TYPE_VAR_INT32_AS_INT16:
- WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->_resultInt);
+ WRITE_VARO_UINT16(dest + i * 4, _vm->_parse->getResultInt());
break;
case TYPE_VAR_STR:
@@ -394,8 +394,8 @@
evalExpr(0);
- _vm->_draw->_backColor = _vm->_parse->_resultInt & 0xFFFF;
- uint16 extraVar = _vm->_parse->_resultInt >> 16;
+ _vm->_draw->_backColor = _vm->_parse->getResultInt() & 0xFFFF;
+ uint16 extraVar = _vm->_parse->getResultInt() >> 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-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/parse.cpp 2009-06-22 10:11:25 UTC (rev 41750)
@@ -1140,4 +1140,8 @@
}
}
+int32 Parse::getResultInt() {
+ return _resultInt;
+}
+
} // End of namespace Gob
Modified: scummvm/trunk/engines/gob/parse.h
===================================================================
--- scummvm/trunk/engines/gob/parse.h 2009-06-22 06:35:08 UTC (rev 41749)
+++ scummvm/trunk/engines/gob/parse.h 2009-06-22 10:11:25 UTC (rev 41750)
@@ -111,6 +111,9 @@
class Parse {
public:
+ Parse(GobEngine *vm);
+ virtual ~Parse() {}
+
void skipExpr(char stopToken);
void printExpr(char stopToken);
void printVarIndex(void);
@@ -119,11 +122,9 @@
int16 parseValExpr(byte stopToken = 99);
int16 parseExpr(byte stopToken, byte *type);
- Parse(GobEngine *vm);
- virtual ~Parse() {}
+ int32 getResultInt();
char _resultStr[200];
- int32 _resultInt;
private:
class Stack {
@@ -154,6 +155,8 @@
GobEngine *_vm;
+ int32 _resultInt;
+
int32 encodePtr(byte *ptr, int type);
byte *decodePtr(int32 n);
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