aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-07-11 03:46:32 +0000
committerTravis Howell2004-07-11 03:46:32 +0000
commit26f4df6aa35199522be4111da17e38f7a6ffbd61 (patch)
treead0a6ad02b439626082cd28ab9dbecafaf4e8b17 /scumm/scumm.cpp
parente94931462ba4eced22f9b4d9f665a86619d25ecd (diff)
downloadscummvm-rg350-26f4df6aa35199522be4111da17e38f7a6ffbd61.tar.gz
scummvm-rg350-26f4df6aa35199522be4111da17e38f7a6ffbd61.tar.bz2
scummvm-rg350-26f4df6aa35199522be4111da17e38f7a6ffbd61.zip
Color cycling is only used in SCUMM 4+ games.
svn-id: r14186
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index a1bd2728ec..91f500acec 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1652,7 +1652,8 @@ load_game:
processActors();
_fullRedraw = false;
- cyclePalette();
+ if (_version >= 4 && _heversion <= 60)
+ cyclePalette();
palManipulate();
if (_doEffect) {
@@ -2134,7 +2135,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
runExitScript();
killScriptsAndResources();
clearEnqueue();
- stopCycle(0);
+ if (_version >= 4 && _heversion <= 60)
+ stopCycle(0);
_sound->processSoundQues();
for (i = 1; i < _numActors; i++) {