[Scummvm-cvs-logs] CVS: scummvm/scumm palette_he.cpp,1.13,1.14 script_v100he.cpp,2.135,2.136

[kirben]

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

Modified Files:
	palette_he.cpp script_v100he.cpp 
Log Message:

Sync. HE100.


Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- palette_he.cpp	21 Apr 2005 16:02:37 -0000	1.13
+++ palette_he.cpp	21 Apr 2005 16:07:30 -0000	1.14
@@ -138,7 +138,6 @@
 	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_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.135
retrieving revision 2.136
diff -u -d -r2.135 -r2.136
--- script_v100he.cpp	21 Apr 2005 05:14:19 -0000	2.135
+++ script_v100he.cpp	21 Apr 2005 16:07:31 -0000	2.136
@@ -2388,15 +2388,16 @@
 }
 
 void ScummEngine_v100he::o100_getPaletteData() {
+	int b, c, d, e;
 	int palSlot, color;
 
 	byte subOp = fetchScriptByte();
 
 	switch (subOp) {
 	case 13:
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		b = pop();
+		push(getPaletteUnk2(1, b, c));
 		break;
 	case 20:
 		color = pop();
@@ -2404,25 +2405,29 @@
 		push(getHEPaletteColor(palSlot, color));
 		break;
 	case 33:
+		e = pop();
+		d = pop();
+		palSlot = pop();
 		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		b = pop();
+		push(getPaletteUnk1(palSlot, b, c, d, e));
 		break;
 	case 53:
 		pop();
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		c = MAX(0, c);
+		c = MIN(c, 255);
+		b = pop();
+		b = MAX(0, b);
+		b = MIN(b, 255);
+		push(getPaletteUnk1(1, b, c, 10, 245));
 		break;
 	case 73:
-		pop();
-		pop();
-		pop();
-		push(0);
+		c = pop();
+		b = pop();
+		palSlot = pop();
+		push(getPaletteUnk2(palSlot, b, c));
 		break;
 	default:
 		error("o100_getPaletteData: Unknown case %d", subOp);