[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.453,2.454 palette_he.cpp,1.12,1.13 script_v90he.cpp,2.235,2.236

[kirben]

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

Modified Files:
	intern.h palette_he.cpp script_v90he.cpp 
Log Message:

Add palette function for HE99+ games.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.453
retrieving revision 2.454
diff -u -d -r2.453 -r2.454
--- intern.h	21 Apr 2005 15:40:40 -0000	2.453
+++ intern.h	21 Apr 2005 16:02:37 -0000	2.454
@@ -1003,6 +1003,7 @@
 	uint8 *getHEPaletteIndex(int palSlot);
 	int getHEPaletteColor(int palSlot, int color);
 	int getPaletteUnk1(int palSlot, int arg_4, int arg_8, int start, int end);
+	int getPaletteUnk2(int palSlot, int unk1, int unk2);
 
 	void setHEPaletteColor(int palSlot, uint8 color, uint8 r, uint8 g, uint8 b);
 	void setHEPaletteFromPtr(int palSlot, const uint8 *palData);

Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- palette_he.cpp	21 Apr 2005 15:40:40 -0000	1.12
+++ palette_he.cpp	21 Apr 2005 16:02:37 -0000	1.13
@@ -131,6 +131,14 @@
 	return bestitem;
 }
 
+int ScummEngine_v90he::getPaletteUnk2(int palSlot, int unk1, int unk2) {
+	assert(palSlot >= 1 && palSlot <= _numPalettes);
+	assert(unk1 >= 1 && unk1 <= 255);
+
+	return _hePalettes[palSlot * 1024 + unk1 * 3 + unk2 / 3];
+}
+
+
 int ScummEngine_v90he::getHEPaletteColor(int palSlot, int color) {
 	assert(palSlot >= 1 && palSlot <= _numPalettes);
 	assert(color >= 1 && color <= 255);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.235
retrieving revision 2.236
diff -u -d -r2.235 -r2.236
--- script_v90he.cpp	21 Apr 2005 15:40:40 -0000	2.235
+++ script_v90he.cpp	21 Apr 2005 16:02:37 -0000	2.236
@@ -2273,10 +2273,10 @@
 		push(getPaletteUnk1(palSlot, b, c, d, e));
 		break;
 	case 7:
-		pop();
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		b = pop();
+		palSlot = pop();
+		push(getPaletteUnk2(palSlot, b, c));
 		break;
 	case 21:
 		color = pop();
@@ -2284,9 +2284,9 @@
 		push(getHEPaletteColor(palSlot, color));
 		break;
 	case 87:
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		b = pop();
+		push(getPaletteUnk2(1, b, c));
 		break;
 	case 172:
 		pop();