[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.379.2.3,1.379.2.4 actor.h,1.83.2.3,1.83.2.4 saveload.cpp,1.239.2.3,1.239.2.4 saveload.h,1.64.2.3,1.64.2.4 wiz_he.cpp,2.96.2.3,2.96.2.4

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	actor.cpp actor.h saveload.cpp saveload.h wiz_he.cpp 
Log Message:

Load/Save palette correctly in HE99 games.
Save actor shadows in HE games.
Back port compile warning fix.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.379.2.3
retrieving revision 1.379.2.4
diff -u -d -r1.379.2.3 -r1.379.2.4
--- actor.cpp	21 Oct 2005 12:11:10 -0000	1.379.2.3
+++ actor.cpp	22 Oct 2005 04:12:08 -0000	1.379.2.4
@@ -2196,6 +2196,8 @@
 		MKLINE(Actor, _needBgReset, sleByte, VER(8)),
 		MKLINE(Actor, _costumeNeedsInit, sleByte, VER(8)),
 		MKLINE(Actor, _heCondMask, sleUint32, VER(38)),
+		MKLINE(Actor, _hePaletteNum, sleUint32, VER(59)),
+		MKLINE(Actor, _heXmapNum, sleUint32, VER(59)),
 
 		MKLINE(Actor, _talkPosY, sleInt16, VER(8)),
 		MKLINE(Actor, _talkPosX, sleInt16, VER(8)),

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.83.2.3
retrieving revision 1.83.2.4
diff -u -d -r1.83.2.3 -r1.83.2.4
--- actor.h	21 Oct 2005 12:11:10 -0000	1.83.2.3
+++ actor.h	22 Oct 2005 04:12:08 -0000	1.83.2.4
@@ -134,12 +134,12 @@
 	CostumeData _cost;
 
 	/* HE specific */
-	int32 _heXmapNum;
-	byte _hePaletteNum;
 	bool _heNoTalkAnimation;
 	bool _heSkipLimbs;
 	bool _heTalking;
 	uint32 _heCondMask;
+	uint32 _hePaletteNum;
+	uint32 _heXmapNum;
 
 	AuxBlock _auxBlock;
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.239.2.3
retrieving revision 1.239.2.4
diff -u -d -r1.239.2.3 -r1.239.2.4
--- saveload.cpp	19 Oct 2005 12:11:31 -0000	1.239.2.3
+++ saveload.cpp	22 Oct 2005 04:12:08 -0000	1.239.2.4
@@ -1280,7 +1280,7 @@
 void ScummEngine_v99he::saveOrLoad(Serializer *s, uint32 savegameVersion) {
 	ScummEngine_v90he::saveOrLoad(s, savegameVersion);
 
-	s->saveLoadArrayOf(_hePalettes, _numPalettes, sizeof(_hePalettes[0]), sleUint8);
+	s->saveLoadArrayOf(_hePalettes, (_numPalettes + 1) * 1024, sizeof(_hePalettes[0]), sleUint8);
 }
 
 void ScummEngine_v100he::saveOrLoad(Serializer *s, uint32 savegameVersion) {

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.64.2.3
retrieving revision 1.64.2.4
diff -u -d -r1.64.2.3 -r1.64.2.4
--- saveload.h	21 Oct 2005 12:11:10 -0000	1.64.2.3
+++ saveload.h	22 Oct 2005 04:12:08 -0000	1.64.2.4
@@ -45,7 +45,7 @@
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 58
+#define CURRENT_VER 59
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.96.2.3
retrieving revision 2.96.2.4
diff -u -d -r2.96.2.3 -r2.96.2.4
--- wiz_he.cpp	21 Oct 2005 01:36:04 -0000	2.96.2.3
+++ wiz_he.cpp	22 Oct 2005 04:12:08 -0000	2.96.2.4
@@ -498,12 +498,13 @@
 					}
 					while (code--) {
 						if (xmapPtr) {
-							*dstPtr++ = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr];
+							dstPtr++;
 						} else {
 							*dstPtr++ = palPtr[*dataPtr];
 						}
 					}
-					*dataPtr++;
+					dataPtr++;
 				} else {
 dec_sub3:			w -= code;
 					if (w < 0) {
@@ -511,7 +512,8 @@
 					}
 					while (code--) {
 						if (xmapPtr) {
-							*dstPtr++ = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr];
+							dstPtr++;
 						} else {
 							*dstPtr++ = palPtr[*dataPtr++];
 						}