thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r30271
This commit is contained in:
Max Horn 2008-01-05 23:05:16 +00:00
parent 063aecaf7a
commit dce7a57cad
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/scumm/scumm.cpp
View file

@ -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;

2
engines/scumm/scumm.h
View file

@ -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;

4
engines/scumm/vars.cpp
View file

@ -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;