aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2009-06-15 23:09:37 +0000
committerSven Hesse2009-06-15 23:09:37 +0000
commitf6ca65206f6e4498541ede7bc936f1700b36c253 (patch)
tree3f6b762f148bf3aec644584ab782a0a9117b8adb /engines/gob/inter_v2.cpp
parent190dd0d077d3a1e82e7604668fab7e26189d2914 (diff)
downloadscummvm-rg350-f6ca65206f6e4498541ede7bc936f1700b36c253.tar.gz
scummvm-rg350-f6ca65206f6e4498541ede7bc936f1700b36c253.tar.bz2
scummvm-rg350-f6ca65206f6e4498541ede7bc936f1700b36c253.zip
Renaming some variables in o1_assign() and o2_assign() to mirror the structure in o6_assign()
svn-id: r41569
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r--engines/gob/inter_v2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 3b54f1e0ee..e92d6ce077 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -1589,7 +1589,7 @@ void Inter_v2::o2_resetImdFrontSurf() {
}
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 @@ bool Inter_v2::o2_assign(OpFuncParams &params) {
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 @@ bool Inter_v2::o2_assign(OpFuncParams &params) {
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);