thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Load/Save palette correctly in HE99 games.

Browse source 
Save actor shadows in HE games.

svn-id: r19231
This commit is contained in:
Travis Howell 2005-10-22 04:08:48 +00:00
parent 4079dd03b1
commit 3374e399b5
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/actor.cpp
View file

@ -2196,6 +2196,8 @@ void Actor::saveLoadWithSerializer(Serializer *ser) {
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)),

4
scumm/actor.h
View file

@ -133,12 +133,12 @@ public:
CostumeData _cost;
/* HE specific */
int32 _heXmapNum;
byte _hePaletteNum;
bool _heNoTalkAnimation;
bool _heSkipLimbs;
bool _heTalking;
uint32 _heCondMask;
uint32 _hePaletteNum;
uint32 _heXmapNum;
AuxBlock _auxBlock;

2
scumm/saveload.cpp
View file

@ -1270,7 +1270,7 @@ void ScummEngine_v90he::saveOrLoad(Serializer *s, uint32 savegameVersion) {
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) {

2
scumm/saveload.h
View file

@ -45,7 +45,7 @@ namespace Scumm {
* 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

2
scumm/wiz_he.cpp
View file

@ -504,7 +504,7 @@ dec_sub2: w -= code;
*dstPtr++ = palPtr[*dataPtr];
}
}
*dataPtr++;
dataPtr++;
} else {
dec_sub3: w -= code;
if (w < 0) {