[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.504,2.505 saveload.cpp,1.229,1.230
kirben
kirben at users.sourceforge.net
Sat May 28 03:45:18 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.158,2.159
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.66,1.67 input.cpp,1.41,1.42 interface.cpp,1.94,1.95 interface.h,1.51,1.52 puzzle.cpp,1.3,1.4 saga.h,1.94,1.95 saveload.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18059/scumm
Modified Files:
intern.h saveload.cpp
Log Message:
Fix load/save game regression in HE90+ games.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.504
retrieving revision 2.505
diff -u -d -r2.504 -r2.505
--- intern.h 28 May 2005 08:37:34 -0000 2.504
+++ intern.h 28 May 2005 10:44:27 -0000 2.505
@@ -1095,6 +1095,7 @@
int32 _curMaxSpriteId;
int32 _curSpriteId;
int32 _curSpriteGroupId;
+ int32 _numSpritesToProcess;
public:
ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- saveload.cpp 26 May 2005 10:07:32 -0000 1.229
+++ saveload.cpp 28 May 2005 10:44:27 -0000 1.230
@@ -1081,7 +1081,7 @@
MKLINE(ScummEngine_v90he, _curMaxSpriteId, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _curSpriteId, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _curSpriteGroupId, sleInt32, VER(51)),
- MKLINE(ScummEngine_v90he, _sprite->_numSpritesToProcess, sleInt32, VER(51)),
+ MKLINE(ScummEngine_v90he, _numSpritesToProcess, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _heObject, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _heObjectNum, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _hePaletteNum, sleInt32, VER(51)),
@@ -1091,7 +1091,10 @@
_sprite->saveOrLoadSpriteData(&*s, savegameVersion);
s->saveLoadArrayOf(&_floodStateParams, 1, sizeof(_floodStateParams), floodStateEntries);
+
+ _numSpritesToProcess = _sprite->_numSpritesToProcess;
s->saveLoadEntries(this, HE90Entries);
+ _sprite->_numSpritesToProcess = _numSpritesToProcess;
if (_heversion >= 99) {
s->saveLoadArrayOf(_hePalettes, _numPalettes, sizeof(_hePalettes[0]), sleUint8);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.158,2.159
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.66,1.67 input.cpp,1.41,1.42 interface.cpp,1.94,1.95 interface.h,1.51,1.52 puzzle.cpp,1.3,1.4 saga.h,1.94,1.95 saveload.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list