From e7da62763ecb26a35b2a4624226a8ee2bf79a853 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 21 Jun 2010 21:33:22 +0000
Subject: AGI: Turn timerHack and curLogic into AgiEngine members; get rid of
 some #defines

svn-id: r50125
---
 engines/agi/op_test.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'engines/agi/op_test.cpp')

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]);
-- 
cgit v1.2.3