[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.207,1.208
Max Horn
fingolfin at users.sourceforge.net
Tue Apr 26 08:48:31 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.464,2.465 palette.cpp,2.40,2.41 scumm.h,1.601,1.602
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.437,2.438 script_v2.cpp,2.275,2.276 scumm.h,1.602,1.603 verbs.cpp,1.132,1.133
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25636
Modified Files:
saveload.cpp
Log Message:
Call setupVolumes in a more appropriate part of the save/load code
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- saveload.cpp 26 Apr 2005 13:16:18 -0000 1.207
+++ saveload.cpp 26 Apr 2005 13:22:46 -0000 1.208
@@ -183,6 +183,9 @@
saveOrLoad(&ser, hdr.ver);
delete in;
+ // Update volume settings
+ setupVolumes();
+
// Normally, _vm->_screenTop should always be >= 0, but for some old save games
// it is not, hence we check & correct it here.
if (_screenTop < 0)
@@ -913,9 +916,6 @@
// This is probably only needed for Loom.
saveOrLoadCursorImages(s);
-
- if (s->isLoading())
- setupVolumes();
}
void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.464,2.465 palette.cpp,2.40,2.41 scumm.h,1.601,1.602
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.437,2.438 script_v2.cpp,2.275,2.276 scumm.h,1.602,1.603 verbs.cpp,1.132,1.133
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list