[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.27,1.28 actor.h,1.4,1.5 costume.h,1.3,1.4 saveload.cpp,1.20,1.21

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv23518

Modified Files:
	actor.cpp actor.h costume.h saveload.cpp 
Log Message:
increasing actor palette to 256

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- actor.cpp	10 Nov 2002 12:59:36 -0000	1.27
+++ actor.cpp	10 Nov 2002 17:17:11 -0000	1.28
@@ -1144,8 +1144,14 @@
 		cost.reset();
 	}
 
-	for (i = 0; i < 32; i++)
-		palette[i] = 0xFF;
+	if (_features & GF_AFTER_V7) {
+		for (i = 0; i < 256; i++)
+			palette[i] = 0xFF;
+	} else {
+		for (i = 0; i < 32; i++)
+			palette[i] = 0xFF;
+	}
+
 }
 
 void Actor::startWalkActor(int destX, int destY, int dir)

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- actor.h	23 Oct 2002 00:22:55 -0000	1.4
+++ actor.h	10 Nov 2002 17:17:11 -0000	1.5
@@ -111,7 +111,7 @@
 	int16 animVariable[16];
 	uint16 sound[8];
 	CostumeData cost;
-	byte palette[64];
+	byte palette[256];
 
 protected:
 	Scumm *_vm;

Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- costume.h	24 Oct 2002 13:10:15 -0000	1.3
+++ costume.h	10 Nov 2002 17:17:11 -0000	1.4
@@ -82,7 +82,7 @@
 	int _imgbufoffs;
 	byte _repcolor;
 	byte _replen;
-	byte _palette[32];
+	byte _palette[256];
 
 	void proc6();
 	void proc5();

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- saveload.cpp	6 Nov 2002 17:55:44 -0000	1.20
+++ saveload.cpp	10 Nov 2002 17:17:11 -0000	1.21
@@ -265,6 +265,7 @@
 		MKLINE(Actor, speedy, sleUint16),
 		MKLINE(Actor, cost.animCounter1, sleUint16),
 		MKLINE(Actor, cost.animCounter2, sleByte),
+		// TODO: increase actor palette to 256
 		MKARRAY(Actor, palette[0], sleByte, 64),
 		MKLINE(Actor, mask, sleByte), // FIXME: see actor.h comment
 		MKLINE(Actor, shadow_mode, sleByte),