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

Revert recent change that breaks temporary saves (No music or even crashes)

Browse source 
svn-id: r12938
This commit is contained in:
Travis Howell 2004-02-20 01:31:29 +00:00
parent 9f073e44c7
commit 83935dd920
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scumm/saveload.cpp
View file

@ -657,18 +657,6 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
// Save all resource.
int type, idx;
if (s->isLoading()) {
// When loading, start by deleting old non-permanent resources (an
// exception is made for buffer/temp resources, they are going to be
// deleted later on anyway).
for (type = rtFirst; type <= rtLast; type++) {
if (res.mode[type] != 1 && type != rtTemp && type != rtBuffer)
for (idx = 1; idx < res.num[type]; idx++)
nukeResource(type, idx);
}
}
if (savegameVersion >= VER(26)) {
// New, more robust resource save/load system. This stores the type
// and index of each resource. Thus if we increase e.g. the maximum
@ -701,9 +689,10 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) {
// with index 0, and breaks whenever we change the limit on a given
// resource type.
for (type = rtFirst; type <= rtLast; type++)
if (res.mode[type] != 1 && type != rtTemp && type != rtBuffer)
if (res.mode[type] != 1)
for (idx = 1; idx < res.num[type]; idx++)
saveLoadResource(s, type, idx);
if (type != rtTemp && type != rtBuffer)
saveLoadResource(s, type, idx);
}
s->saveLoadArrayOf(_objectOwnerTable, _numGlobalObjects, sizeof(_objectOwnerTable[0]), sleByte);