cleanup

svn-id: r15222

5 files changed, 23 insertions, 33 deletions

diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 5f4ed3b09d..99c2a9f665 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -149,12 +149,6 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
 	setDirtyColors(0, numcolor - 1);
 }
 
-void ScummEngine::setPaletteFromRes() {
-	byte *ptr;
-	ptr = getResourceAddress(rtRoom, _roomResource) + _CLUT_offs;
-	setPaletteFromPtr(ptr);
-}
-
 void ScummEngine::setDirtyColors(int min, int max) {
 	if (_palDirtyMin > min)
 		_palDirtyMin = min;
@@ -170,7 +164,6 @@ void ScummEngine::initCycl(const byte *ptr) {
 
 	if (_features & GF_SMALL_HEADER) {
 		cycl = _colorCycle;
-		ptr += 6;
 		for (j = 0; j < 16; ++j, ++cycl) {
 			uint16 delay = READ_BE_UINT16(ptr);
 			ptr += 2;
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index ebaa6fde8f..364af53bc1 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -794,7 +794,7 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 	}
 
 	if (savegameVersion >= VER(32) && _heversion == 70)
-			s->saveLoadArrayOf(_HEV7ActorPalette, sizeof(_HEV7ActorPalette), 1, sleByte);
+		s->saveLoadArrayOf(_HEV7ActorPalette, sizeof(_HEV7ActorPalette), 1, sleByte);
 
 	// PalManip data was not saved before V10 save games
 	if (savegameVersion < VER(10))
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index fc63094b5e..b715a50342 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2257,29 +2257,37 @@ void ScummEngine::initRoomSubBlocks() {
 
 	if (ptr) {
 		_CLUT_offs = ptr - roomptr;
-		setPaletteFromRes();
 	}
 
 	if (_version >= 6) {
 		ptr = findResource(MKID('PALS'), roomptr);
 		if (ptr) {
 			_PALS_offs = ptr - roomptr;
-			setPalette(0);
 		}
 	}
 
 	// Color cycling
 	// HE 7.0 games load resources but don't use them.
 	if (_version >= 4 && _heversion <= 60) {
-		if (_features & GF_SMALL_HEADER)
-			ptr = findResourceSmall(MKID('CYCL'), roomptr);
-		else 
-			ptr = findResourceData(MKID('CYCL'), roomptr);
+		ptr = findResourceData(MKID('CYCL'), roomptr);
 		if (ptr) {
 			initCycl(ptr);
 		}
 	}
 
+	// Transparent color
+	if (_features & GF_OLD_BUNDLE)
+		gdi._transparentColor = 255;
+	else {
+		ptr = findResourceData(MKID('TRNS'), roomptr);
+		if (ptr)
+			gdi._transparentColor = ptr[0];
+		else if (_version == 8)
+			gdi._transparentColor = 5;
+		else
+			gdi._transparentColor = 255;
+	}
+
 	// Actor Palette in HE 70 games
 	if (_heversion == 70) {
 		ptr = findResourceData(MKID('REMP'), roomptr);
@@ -2323,18 +2331,8 @@ void ScummEngine::initRoomSubBlocks() {
 
 	}
 
-	// Transparent color
-	if (_features & GF_OLD_BUNDLE)
-		gdi._transparentColor = 255;
-	else {
-		ptr = findResourceData(MKID('TRNS'), roomptr);
-		if (ptr)
-			gdi._transparentColor = ptr[0];
-		else if (_version == 8)
-			gdi._transparentColor = 5;
-		else
-			gdi._transparentColor = 255;
-	}
+	if (_PALS_offs || _CLUT_offs)
+		setPalette(0);
 
 	initBGBuffers(_roomHeight);
 }
diff --git a/scumm/scumm.h b/scumm/scumm.h
index fcb3af4bb7..9df953c4db 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -968,7 +968,6 @@ protected:
 	void setupV1ZakPalette();
 	void setPalette(int pal);
 	void setPaletteFromPtr(const byte *ptr, int numcolor = -1);
-	void setPaletteFromRes();
 	void setPalColor(int index, int r, int g, int b);
 	void setDirtyColors(int min, int max);
 	const byte *findPalInPals(const byte *pal, int index);
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 18374a2400..aaeec93bc3 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -359,7 +359,7 @@ void ScummEngine_v7::setupScummVars() {
 	VAR_DEBUGMODE = 116;
 	VAR_FADE_DELAY = 117;
 
-	// Full Throttle specific	
+	// Full Throttle specific
 	VAR_CHARSET_MASK = 119;
 
 	VAR_VIDEONAME = 123;
@@ -454,16 +454,16 @@ void ScummEngine_v8::setupScummVars() {
 	VAR_CAMERA_THRESHOLD_X = 124;
 	VAR_CAMERA_THRESHOLD_Y = 125;
 
-	VAR_BLAST_ABOVE_TEXT = 133;
-
 	VAR_EGO = 126;
 
+	VAR_DEFAULT_TALK_DELAY = 128;
+	VAR_CHARINC = 129;
+
+	VAR_BLAST_ABOVE_TEXT = 133;
+
 	VAR_DEBUGMODE = 130;
 	VAR_KEYPRESS = 132;
 	VAR_SYNC = 134;
-
-	VAR_DEFAULT_TALK_DELAY = 128;
-	VAR_CHARINC = 129;
 }
 
 void ScummEngine::initScummVars() {