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

SCUMM: merge object v0 id and type into one object var

Browse source
This commit is contained in:
Tobias Gunkel 2012-01-16 22:32:46 +01:00
parent 8141511e2f
commit 347035385e
7 changed files with 44 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/scumm/saveload.cpp
View file

@ -822,7 +822,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
MKLINE(ObjectData, parent, sleByte, VER(8)),
MKLINE(ObjectData, state, sleByte, VER(8)),
MKLINE(ObjectData, fl_object_index, sleByte, VER(8)),
MKLINE(ObjectData, extra, sleByte, VER(46)),
MKLINE(ObjectData, flags, sleByte, VER(46)),
MKEND()
};
@ -1205,12 +1205,17 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// Save/load local objects
//
s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]), objectEntries);
if (s->isLoading() && s->getVersion() < VER(13)) {
// Since roughly v13 of the save games, the objs storage has changed a bit
for (i = _numObjectsInRoom; i < _numLocalObjects; i++) {
_objs[i].obj_nr = 0;
if (s->isLoading()) {
if (s->getVersion() < VER(13)) {
// Since roughly v13 of the save games, the objs storage has changed a bit
for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
_objs[i].obj_nr = 0;
} else if (_game.version == 0) { // TODO: handle this correctly
for (i = 0; i < _numLocalObjects; i++) {
if (_objs[i].obj_nr != 0 && _objs[i].flags != 0)
_objs[i].obj_nr = OBJECT_V0(_objs[i].obj_nr, _objs[i].flags);
}
}
}