From 26f4df6aa35199522be4111da17e38f7a6ffbd61 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 11 Jul 2004 03:46:32 +0000
Subject: Color cycling is only used in SCUMM 4+ games.

svn-id: r14186
---
 scumm/palette.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'scumm/palette.cpp')

diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 07f4da1170..20f131b482 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -271,18 +271,9 @@ void ScummEngine::cyclePalette() {
 	int valueToAdd;
 	int i, j;
 
-	if (VAR_TIMER == 0xFF) {
-		// FIXME - no idea if this is right :-/
-		// Needed for both V2 and V8 at this time
+	valueToAdd = VAR(VAR_TIMER);
+	if (valueToAdd < VAR(VAR_TIMER_NEXT))
 		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;
 
 	for (i = 0, cycl = _colorCycle; i < 16; i++, cycl++) {
 		if (!cycl->delay || cycl->start > cycl->end)
-- 
cgit v1.2.3