diff options
| author | Max Horn | 2010-06-21 21:33:22 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-21 21:33:22 +0000 |
| commit | e7da62763ecb26a35b2a4624226a8ee2bf79a853 (patch) | |
| tree | da593c34682c420d8fde07ce582106685a44af79 /engines/agi/op_test.cpp | |
| parent | df569a6c822f3893c9daeee649fde7a974ee1cd2 (diff) | |
| download | scummvm-rg350-e7da62763ecb26a35b2a4624226a8ee2bf79a853.tar.gz scummvm-rg350-e7da62763ecb26a35b2a4624226a8ee2bf79a853.tar.bz2 scummvm-rg350-e7da62763ecb26a35b2a4624226a8ee2bf79a853.zip | |
AGI: Turn timerHack and curLogic into AgiEngine members; get rid of some #defines
svn-id: r50125
Diffstat (limited to 'engines/agi/op_test.cpp')
| -rw-r--r-- | engines/agi/op_test.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index f10cdd3f17..6967f6c665 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -51,8 +51,6 @@ static AgiEngine *g_agi; #define testHas(obj) (g_agi->objectGetLocation(obj) == EGO_OWNED) #define testObjInRoom(obj, v) (g_agi->objectGetLocation(obj) == g_agi->getvar(v)) -extern int timerHack; // For the timer loop in MH1 logic 153 - static uint8 testCompareStrings(uint8 s1, uint8 s2) { char ms1[MAX_STRINGLEN]; char ms2[MAX_STRINGLEN]; @@ -263,32 +261,32 @@ int AgiEngine::testIfCode(int lognum) { case 0x01: ec = testEqual(p[0], p[1]); if (p[0] == 11) - timerHack++; + _timerHack++; break; case 0x02: ec = testEqual(p[0], getvar(p[1])); if (p[0] == 11 || p[1] == 11) - timerHack++; + _timerHack++; break; case 0x03: ec = testLess(p[0], p[1]); if (p[0] == 11) - timerHack++; + _timerHack++; break; case 0x04: ec = testLess(p[0], getvar(p[1])); if (p[0] == 11 || p[1] == 11) - timerHack++; + _timerHack++; break; case 0x05: ec = testGreater(p[0], p[1]); if (p[0] == 11) - timerHack++; + _timerHack++; break; case 0x06: ec = testGreater(p[0], getvar(p[1])); if (p[0] == 11 || p[1] == 11) - timerHack++; + _timerHack++; break; case 0x07: ec = testIsSet(p[0]); |