[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.17,2.18 saveload.cpp,1.176,1.177 scumm.cpp,1.223,1.224 scumm.h,1.491,1.492 vars.cpp,1.106,1.107

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13409

Modified Files:
	palette.cpp saveload.cpp scumm.cpp scumm.h vars.cpp 
Log Message:
cleanup

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- palette.cpp	18 Sep 2004 00:36:16 -0000	2.17
+++ palette.cpp	21 Sep 2004 12:44:33 -0000	2.18
@@ -149,12 +149,6 @@
 	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 @@
 
 	if (_features & GF_SMALL_HEADER) {
 		cycl = _colorCycle;
-		ptr += 6;
 		for (j = 0; j < 16; ++j, ++cycl) {
 			uint16 delay = READ_BE_UINT16(ptr);
 			ptr += 2;

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- saveload.cpp	18 Sep 2004 22:42:43 -0000	1.176
+++ saveload.cpp	21 Sep 2004 12:44:33 -0000	1.177
@@ -794,7 +794,7 @@
 	}
 
 	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))

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- scumm.cpp	21 Sep 2004 01:00:30 -0000	1.223
+++ scumm.cpp	21 Sep 2004 12:44:33 -0000	1.224
@@ -2257,29 +2257,37 @@
 
 	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 @@
 
 	}
 
-	// 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);
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -d -r1.491 -r1.492
--- scumm.h	20 Sep 2004 22:04:05 -0000	1.491
+++ scumm.h	21 Sep 2004 12:44:33 -0000	1.492
@@ -968,7 +968,6 @@
 	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);

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- vars.cpp	20 Sep 2004 22:04:06 -0000	1.106
+++ vars.cpp	21 Sep 2004 12:44:34 -0000	1.107
@@ -359,7 +359,7 @@
 	VAR_DEBUGMODE = 116;
 	VAR_FADE_DELAY = 117;
 
-	// Full Throttle specific	
+	// Full Throttle specific
 	VAR_CHARSET_MASK = 119;
 
 	VAR_VIDEONAME = 123;
@@ -454,16 +454,16 @@
 	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() {