aboutsummaryrefslogtreecommitdiff
path: root/scumm/gfx.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-08 20:37:06 +0000
committerMax Horn2003-05-08 20:37:06 +0000
commit6d2c0de5f2a1fba9398d4a72e56fbead920b82de (patch)
tree3d43cdffeb1bd5ed44b526a03dcdf29d377fa65f /scumm/gfx.cpp
parent0461222181d648c90e9dbd493909a2ff9b0e800b (diff)
downloadscummvm-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/gfx.cpp')
-rw-r--r--scumm/gfx.cpp9
1 files changed, 7 insertions, 2 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;