diff options
author | Sven Hesse | 2009-06-15 23:08:28 +0000 |
---|---|---|
committer | Sven Hesse | 2009-06-15 23:08:28 +0000 |
commit | 42007f9d04fc22a18b3d4f99556fa5d7f646acee (patch) | |
tree | 1c02ef7526abc3161548cc6e3256f477d2f3b442 /engines/gob/inter_v6.cpp | |
parent | e8a89cffb6cf37a7fa34b5761befff13b33dbdc7 (diff) | |
download | scummvm-rg350-42007f9d04fc22a18b3d4f99556fa5d7f646acee.tar.gz scummvm-rg350-42007f9d04fc22a18b3d4f99556fa5d7f646acee.tar.bz2 scummvm-rg350-42007f9d04fc22a18b3d4f99556fa5d7f646acee.zip |
Propagating variable name changes
svn-id: r41565
Diffstat (limited to 'engines/gob/inter_v6.cpp')
-rw-r--r-- | engines/gob/inter_v6.cpp | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index f40314f87e..f178b99114 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -841,31 +841,27 @@ bool Inter_v6::o6_loadCursor(OpFuncParams ¶ms) { } bool Inter_v6::o6_assign(OpFuncParams ¶ms) { - byte *savedPos; - int16 varOff; - int16 token; - int16 result; - byte loopCount; - uint16 var_6, var_A; - - varOff = _vm->_parse->parseVarIndex(&var_6, &var_A); + uint16 size, destType; + int16 dest = _vm->_parse->parseVarIndex(&size, &destType); - if (var_6 != 0) { - int16 var_4; + if (size != 0) { + int16 src; - savedPos = _vm->_global->_inter_execPtr; + byte *savedPos = _vm->_global->_inter_execPtr; - var_4 = _vm->_parse->parseVarIndex(&var_6, 0); + src = _vm->_parse->parseVarIndex(&size, 0); - memcpy(_vm->_inter->_variables->getAddressOff8(varOff), - _vm->_inter->_variables->getAddressOff8(var_4), var_6 * 4); + memcpy(_vm->_inter->_variables->getAddressOff8(dest), + _vm->_inter->_variables->getAddressOff8(src), size * 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 @@ bool Inter_v6::o6_assign(OpFuncParams ¶ms) { 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 @@ bool Inter_v6::o6_assign(OpFuncParams ¶ms) { 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; } } |