diff options
author | Martin Kiewitz | 2016-01-31 20:53:36 +0100 |
---|---|---|
committer | Martin Kiewitz | 2016-01-31 20:53:36 +0100 |
commit | fd9c46831df3bcd09bc6f85d5e41c2beb3f7c024 (patch) | |
tree | 7e85bd08b17c976e78d628fe0da427726ba0ccf3 /engines/agi/op_test.cpp | |
parent | 9acbe6f3f42a35becf3dcff04d758b3286c05c7e (diff) | |
download | scummvm-rg350-fd9c46831df3bcd09bc6f85d5e41c2beb3f7c024.tar.gz scummvm-rg350-fd9c46831df3bcd09bc6f85d5e41c2beb3f7c024.tar.bz2 scummvm-rg350-fd9c46831df3bcd09bc6f85d5e41c2beb3f7c024.zip |
AGI: remove timer hack, implement in game timer
in game timer is now updated, when scripts read in game timer
VM variables and during main loop. ScummVM total play time feature
is used for it. Game cycle syncing is done at the same time.
Diffstat (limited to 'engines/agi/op_test.cpp')
-rw-r--r-- | engines/agi/op_test.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index c461dfc4c4..5836e9aba2 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -42,38 +42,26 @@ namespace Agi { #define testObjInRoom(obj, v) (state->_vm->objectGetLocation(obj) == getVar(v)) void condEqual(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testEqual(p[0], p[1]); } void condEqualV(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS || p[1] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testEqual(p[0], getVar(p[1])); } void condLess(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testLess(p[0], p[1]); } void condLessV(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS || p[1] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testLess(p[0], getVar(p[1])); } void condGreater(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testGreater(p[0], p[1]); } void condGreaterV(AgiGame *state, uint8 *p) { - if (p[0] == VM_VAR_SECONDS || p[1] == VM_VAR_SECONDS) - state->_vm->_timerHack++; state->testResult = testGreater(p[0], getVar(p[1])); } |