diff options
| author | Max Horn | 2003-05-08 20:37:06 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 20:37:06 +0000 |
| commit | 6d2c0de5f2a1fba9398d4a72e56fbead920b82de (patch) | |
| tree | 3d43cdffeb1bd5ed44b526a03dcdf29d377fa65f /scumm | |
| parent | 0461222181d648c90e9dbd493909a2ff9b0e800b (diff) | |
| download | scummvm-rg350-6d2c0de5f2a1fba9398d4a72e56fbead920b82de.tar.gz scummvm-rg350-6d2c0de5f2a1fba9398d4a72e56fbead920b82de.tar.bz2 scummvm-rg350-6d2c0de5f2a1fba9398d4a72e56fbead920b82de.zip | |
more v2 var access fixes
svn-id: r7395
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.cpp | 9 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index f3d2491e48..9b633b2a91 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2759,9 +2759,14 @@ void Scumm::cyclePalette() { byte *start, *end; byte tmp[3]; - valueToAdd = VAR(VAR_TIMER); - if (valueToAdd < VAR(VAR_TIMER_NEXT)) + if (_features & GF_AFTER_V2) { + // FIXME - no idea if this is right :-/ valueToAdd = VAR(VAR_TIMER_NEXT); + } else { + valueToAdd = VAR(VAR_TIMER); + if (valueToAdd < VAR(VAR_TIMER_NEXT)) + valueToAdd = VAR(VAR_TIMER_NEXT); + } if (!_colorCycle) // FIXME return; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 6c41ed28f2..2f8acf8257 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -878,9 +878,11 @@ int Scumm::scummLoop(int delta) { VAR(VAR_HAVE_MSG) = (_haveMsg == 0xFE) ? 0xFF : _haveMsg; VAR(VAR_VIRT_MOUSE_X) = _virtual_mouse_x; VAR(VAR_VIRT_MOUSE_Y) = _virtual_mouse_y; - VAR(VAR_MOUSE_X) = mouse.x; - VAR(VAR_MOUSE_Y) = mouse.y; - VAR(VAR_DEBUGMODE) = _debugMode; + if (!(_features & GF_AFTER_V2)) { + VAR(VAR_MOUSE_X) = mouse.x; + VAR(VAR_MOUSE_Y) = mouse.y; + VAR(VAR_DEBUGMODE) = _debugMode; + } if (_features & GF_AUDIOTRACKS) { // Covered automatically by the Sound class |