From dce7a57cad0c7704e3331f1ac5b30af319a8cead Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 5 Jan 2008 23:05:16 +0000 Subject: VAR_TMR_4 has a special role from VAR_TMR_1 till 3 (in particular, it exists across far more SCUMM versions), so rename it to VAR_TIMER_TOTAL svn-id: r30271 --- engines/scumm/scumm.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/scumm/scumm.cpp') diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index cea4ac3529..45bfcb94dd 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -361,7 +361,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) VAR_MOUSE_X = 0xFF; VAR_MOUSE_Y = 0xFF; VAR_TIMER = 0xFF; - VAR_TMR_4 = 0xFF; + VAR_TIMER_TOTAL = 0xFF; VAR_SOUNDCARD = 0xFF; VAR_VIDEOMODE = 0xFF; VAR_MAINMENU_KEY = 0xFF; @@ -1777,8 +1777,8 @@ int ScummEngine::scummLoop(int delta) { VAR(41) += delta; } } - if (VAR_TMR_4 != 0xFF) - VAR(VAR_TMR_4) += delta; + if (VAR_TIMER_TOTAL != 0xFF) + VAR(VAR_TIMER_TOTAL) += delta; if (delta > 15) delta = 15; -- cgit v1.2.3