diff options
| author | Max Horn | 2003-05-08 15:58:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 15:58:30 +0000 |
| commit | 0461222181d648c90e9dbd493909a2ff9b0e800b (patch) | |
| tree | 56dbb0600f26b2d2efc427ad6d80ff32118acb88 /scumm/scummvm.cpp | |
| parent | 98881c3a6a513c27a06e596c29e0b40b355844f6 (diff) | |
| download | scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.tar.gz scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.tar.bz2 scummvm-rg350-0461222181d648c90e9dbd493909a2ff9b0e800b.zip | |
fixed various cases of bad var access
svn-id: r7394
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 548fecc87a..6c41ed28f2 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -845,10 +845,12 @@ int Scumm::scummLoop(int delta) { // that it will be in a different state each time you run the program. _rnd.getRandomNumber(2); - VAR(VAR_TMR_1) += delta; - VAR(VAR_TMR_2) += delta; - VAR(VAR_TMR_3) += delta; - VAR(VAR_TMR_4) += delta; + if (!(_features & GF_AFTER_V2)) { + VAR(VAR_TMR_1) += delta; + VAR(VAR_TMR_2) += delta; + VAR(VAR_TMR_3) += delta; + VAR(VAR_TMR_4) += delta; + } if (delta > 15) delta = 15; @@ -1047,7 +1049,8 @@ load_game: /* show or hide mouse */ _system->show_mouse(_cursor.state > 0); - VAR(VAR_TIMER) = 0; + if (!(_features & GF_AFTER_V2)) + VAR(VAR_TIMER) = 0; return VAR(VAR_TIMER_NEXT); } |