diff options
| author | Max Horn | 2008-01-05 23:05:16 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-05 23:05:16 +0000 |
| commit | dce7a57cad0c7704e3331f1ac5b30af319a8cead (patch) | |
| tree | 0ac5cdd23dbc708b32efd6c4bfae3529046640ba /engines | |
| parent | 063aecaf7a23bd862371c390fa80a07d2693c148 (diff) | |
| download | scummvm-rg350-dce7a57cad0c7704e3331f1ac5b30af319a8cead.tar.gz scummvm-rg350-dce7a57cad0c7704e3331f1ac5b30af319a8cead.tar.bz2 scummvm-rg350-dce7a57cad0c7704e3331f1ac5b30af319a8cead.zip | |
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
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/scumm.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 2 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
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; diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 89a606cde1..91c258dd98 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -1255,7 +1255,7 @@ public: byte VAR_MOUSE_X; byte VAR_MOUSE_Y; byte VAR_TIMER; - byte VAR_TMR_4; + byte VAR_TIMER_TOTAL; byte VAR_SOUNDCARD; byte VAR_VIDEOMODE; byte VAR_MAINMENU_KEY; diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 8917a80aea..b8cf665023 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -77,7 +77,7 @@ void ScummEngine::setupScummVars() { VAR_MOUSE_X = 44; VAR_MOUSE_Y = 45; VAR_TIMER = 46; - VAR_TMR_4 = 47; + VAR_TIMER_TOTAL = 47; VAR_SOUNDCARD = 48; VAR_VIDEOMODE = 49; @@ -349,7 +349,7 @@ void ScummEngine_v7::setupScummVars() { VAR_TALK_ACTOR = 12; VAR_HAVE_MSG = 13; VAR_TIMER = 14; - VAR_TMR_4 = 15; + VAR_TIMER_TOTAL = 15; VAR_TIMEDATE_YEAR = 16; VAR_TIMEDATE_MONTH = 17; |