From 4239ac74076bb0c7024bd11a511933a3596a5c69 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 26 Apr 2005 14:24:29 +0000
Subject: Since we don't store _CLUT_offs anymore, we can clean up the code
 related to it now

svn-id: r17823
---
 scumm/room.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'scumm/room.cpp')

diff --git a/scumm/room.cpp b/scumm/room.cpp
index 18ca95c4da..c432289784 100644
--- a/scumm/room.cpp
+++ b/scumm/room.cpp
@@ -384,23 +384,9 @@ void ScummEngine::loadRoomSubBlocks() {
 		_EPAL_offs = ptr - roomptr;
 
 	// Locate the standard room palette (for V3-V5 games).
-	// TODO: We used to use findResourceSmall instead of findResourceData;
-	// in the small header case. That means we have to do some ugly trickery
-	// in order to emulate the old behaviour. It would be very nice to get
-	// rid of that. That would require some changes to the palette code.
-	// In particular, it seems only setPaletteFromPtr would have to be
-	// adapted, which would be trivial, since it now adds _resourceHeaderSize
-	// to the palette pointer.
-	//
-	// Of course this would break savegame compatibility unless extra code
-	// were added to the save/load system to cope with this. 
 	ptr = findResourceData(MKID('CLUT'), roomptr);
-
-	if (ptr) {
-		if ((_features & GF_SMALL_HEADER) && ptr)
-			ptr -= _resourceHeaderSize;
+	if (ptr)
 		_CLUT_offs = ptr - roomptr;
-	}
 
 	// Locate the standard room palettes (for V6+ games).
 	if (_version >= 6) {
-- 
cgit v1.2.3