[Scummvm-cvs-logs] SF.net SVN: scummvm:[43950] scummvm/trunk/engines/gob/expression.cpp
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Fri Sep 4 23:38:28 CEST 2009
Revision: 43950
http://scummvm.svn.sourceforge.net/scummvm/?rev=43950&view=rev
Author: drmccoy
Date: 2009-09-04 21:38:28 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
Some more int16->uint16 changes, to accommodate for Playtoons larger variable space
Modified Paths:
--------------
scummvm/trunk/engines/gob/expression.cpp
Modified: scummvm/trunk/engines/gob/expression.cpp
===================================================================
--- scummvm/trunk/engines/gob/expression.cpp 2009-09-04 21:22:09 UTC (rev 43949)
+++ scummvm/trunk/engines/gob/expression.cpp 2009-09-04 21:38:28 UTC (rev 43950)
@@ -623,15 +623,15 @@
return varBase + offset * _vm->_global->_inter_animDataSize + temp;
case OP_LOAD_VAR_INT16:
- return varBase + _vm->_game->_script->readInt16() * 2;
+ return varBase + _vm->_game->_script->readUint16() * 2;
case OP_LOAD_VAR_INT8:
- return varBase + _vm->_game->_script->readInt16();
+ return varBase + _vm->_game->_script->readUint16();
case OP_LOAD_VAR_INT32:
case OP_LOAD_VAR_INT32_AS_INT16:
case OP_LOAD_VAR_STR:
- temp = _vm->_game->_script->readInt16() * 4;
+ temp = _vm->_game->_script->readUint16() * 4;
debugC(5, kDebugExpression, "oper = %d", _vm->_game->_script->peekInt16());
if ((operation == OP_LOAD_VAR_STR) && (_vm->_game->_script->peekByte() == 13)) {
_vm->_game->_script->skip(1);
@@ -701,12 +701,12 @@
case OP_LOAD_VAR_INT16:
*stackFrame.opers = OP_LOAD_IMM_INT16;
- *stackFrame.values = (int16) READ_VARO_UINT16(varBase + _vm->_game->_script->readInt16() * 2);
+ *stackFrame.values = (int16) READ_VARO_UINT16(varBase + _vm->_game->_script->readUint16() * 2);
break;
case OP_LOAD_VAR_INT8:
*stackFrame.opers = OP_LOAD_IMM_INT16;
- *stackFrame.values = (int8) READ_VARO_UINT8(varBase + _vm->_game->_script->readInt16());
+ *stackFrame.values = (int8) READ_VARO_UINT8(varBase + _vm->_game->_script->readUint16());
break;
case OP_LOAD_IMM_INT32:
@@ -731,17 +731,17 @@
case OP_LOAD_VAR_INT32:
*stackFrame.opers = OP_LOAD_IMM_INT16;
- *stackFrame.values = READ_VARO_UINT32(varBase + _vm->_game->_script->readInt16() * 4);
+ *stackFrame.values = READ_VARO_UINT32(varBase + _vm->_game->_script->readUint16() * 4);
break;
case OP_LOAD_VAR_INT32_AS_INT16:
*stackFrame.opers = OP_LOAD_IMM_INT16;
- *stackFrame.values = (int16) READ_VARO_UINT16(varBase + _vm->_game->_script->readInt16() * 4);
+ *stackFrame.values = (int16) READ_VARO_UINT16(varBase + _vm->_game->_script->readUint16() * 4);
break;
case OP_LOAD_VAR_STR:
*stackFrame.opers = OP_LOAD_IMM_STR;
- temp = _vm->_game->_script->readInt16() * 4;
+ temp = _vm->_game->_script->readUint16() * 4;
*stackFrame.values = encodePtr(_vm->_inter->_variables->getAddressOff8(varBase + temp), kInterVar);
if (_vm->_game->_script->peekByte() == 13) {
_vm->_game->_script->skip(1);
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