[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.550,2.551 saveload.cpp,1.261,1.262 sprite_he.cpp,1.164,1.165
kirben
kirben at users.sourceforge.net
Sat Feb 4 01:40:04 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.h,1.75,1.76 sprite_he.cpp,1.163,1.164
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.236.2.11,1.236.2.12 saveload.cpp,1.239.2.8,1.239.2.9 sprite_he.cpp,1.153.2.5,1.153.2.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30449/scumm
Modified Files:
intern.h saveload.cpp sprite_he.cpp
Log Message:
Actually active sprite table doesn't need to be saved.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.550
retrieving revision 2.551
diff -u -d -r2.550 -r2.551
--- intern.h 3 Feb 2006 07:30:29 -0000 2.550
+++ intern.h 4 Feb 2006 09:38:51 -0000 2.551
@@ -1146,7 +1146,6 @@
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.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- saveload.cpp 18 Jan 2006 17:39:45 -0000 1.261
+++ saveload.cpp 4 Feb 2006 09:38:51 -0000 1.262
@@ -1293,7 +1293,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, _numSpritesToProcess, sleInt32, VER(51)),
+ MK_OBSOLETE(ScummEngine_v90he, _numSpritesToProcess, sleInt32, VER(51), VER(63)),
MKLINE(ScummEngine_v90he, _heObject, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _heObjectNum, sleInt32, VER(51)),
MKLINE(ScummEngine_v90he, _hePaletteNum, sleInt32, VER(51)),
@@ -1304,9 +1304,7 @@
s->saveLoadArrayOf(&_floodFillParams, 1, sizeof(_floodFillParams), floodFillEntries);
- _numSpritesToProcess = _sprite->_numSpritesToProcess;
s->saveLoadEntries(this, HE90Entries);
- _sprite->_numSpritesToProcess = _numSpritesToProcess;
}
void ScummEngine_v99he::saveOrLoad(Serializer *s) {
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- sprite_he.cpp 4 Feb 2006 08:40:36 -0000 1.164
+++ sprite_he.cpp 4 Feb 2006 09:38:51 -0000 1.165
@@ -1422,7 +1422,6 @@
};
if (s->getVersion() >= VER(64)) {
- s->saveLoadArrayOf(_activeSpritesTable, _varNumSprites + 1, sizeof(_activeSpritesTable[0]), spriteEntries);
s->saveLoadArrayOf(_spriteTable, _varNumSprites + 1, sizeof(_spriteTable[0]), spriteEntries);
s->saveLoadArrayOf(_spriteGroups, _varNumSpriteGroups + 1, sizeof(_spriteGroups[0]), spriteGroupEntries);
} else {
@@ -1430,6 +1429,11 @@
s->saveLoadArrayOf(_spriteTable, _varNumSprites, sizeof(_spriteTable[0]), spriteEntries);
s->saveLoadArrayOf(_spriteGroups, _varNumSpriteGroups, sizeof(_spriteGroups[0]), spriteGroupEntries);
}
+
+ // Reset active sprite table
+ if (s->isLoading())
+ _numSpritesToProcess = 0;
+
}
} // End of namespace Scumm
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.h,1.75,1.76 sprite_he.cpp,1.163,1.164
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.236.2.11,1.236.2.12 saveload.cpp,1.239.2.8,1.239.2.9 sprite_he.cpp,1.153.2.5,1.153.2.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list