[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Mon Aug 2 10:10:03 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.20,1.21 actor.cpp,1.18,1.19 actor.h,1.6,1.7 actordata.cpp,1.3,1.4 animation.cpp,1.19,1.20 console.cpp,1.8,1.9 cvar.cpp,1.9,1.10 events.cpp,1.15,1.16 expr.cpp,1.5,1.6 font.cpp,1.12,1.13 game.cpp,1.16,1.17 ihnm_introproc.cpp,1.10,1.11 image.cpp,1.13,1.14 interface.cpp,1.15,1.16 isomap.cpp,1.11,1.12 ite_introproc.cpp,1.14,1.15 music.cpp,1.21,1.22 music.h,1.8,1.9 objectmap.cpp,1.14,1.15 palanim.cpp,1.11,1.12 render.cpp,1.23,1.24 rscfile.cpp,1.7,1.8 rscfile_mod.h,1.3,1.4 saga.cpp,1.35,1.36 scene.cpp,1.23,1.24 scene_mod.h,1.5,1.6 script.cpp,1.15,1.16 script.h,1.8,1.9 sdata.cpp,1.11,1.12 sdebug.cpp,1.10,1.11 sfuncs.cpp,1.10,1.11 sfuncs.h,1.4,1.5 sndres.cpp,1.18,1.19 sndres.h,1.9,1.10 sound.cpp,1.9,1.10 sound.h,1.6,1.7 sprite.cpp,1.12,1.13 sstack.cpp,1.5,1.6 sstack.h,1.2,1.3 sthread.cpp,1.16,1.17 sthread.h,1.5,1.6 text.cpp,1.4,1.5 transitions.cpp,1.6,1.7 ys_dl_list.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common config-manager.h,1.11,1.11.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14608
Modified Files:
engine.cpp
Log Message:
Workaround for bug #999122; this will fix config files which were broken by the 0.6.1 release
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- engine.cpp 18 Jul 2004 20:02:26 -0000 1.19
+++ engine.cpp 2 Aug 2004 17:09:31 -0000 1.20
@@ -69,8 +69,17 @@
#endif
// If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
- if (!dir || dir[0] == 0)
+ if (!dir || dir[0] == 0) {
dir = ConfMan.get("savepath").c_str();
+
+ // Work around a bug (#999122) in the original 0.6.1 release of
+ // ScummVM, which would insert a bad savepath value into config files.
+ if (0 == strcmp(dir, "None")) {
+ ConfMan.removeKey("savepath", ConfMan.getActiveDomain());
+ ConfMan.flushToDisk();
+ dir = ConfMan.get("savepath").c_str();
+ }
+ }
#ifdef _WIN32_WCE
if (dir[0] == 0)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.20,1.21 actor.cpp,1.18,1.19 actor.h,1.6,1.7 actordata.cpp,1.3,1.4 animation.cpp,1.19,1.20 console.cpp,1.8,1.9 cvar.cpp,1.9,1.10 events.cpp,1.15,1.16 expr.cpp,1.5,1.6 font.cpp,1.12,1.13 game.cpp,1.16,1.17 ihnm_introproc.cpp,1.10,1.11 image.cpp,1.13,1.14 interface.cpp,1.15,1.16 isomap.cpp,1.11,1.12 ite_introproc.cpp,1.14,1.15 music.cpp,1.21,1.22 music.h,1.8,1.9 objectmap.cpp,1.14,1.15 palanim.cpp,1.11,1.12 render.cpp,1.23,1.24 rscfile.cpp,1.7,1.8 rscfile_mod.h,1.3,1.4 saga.cpp,1.35,1.36 scene.cpp,1.23,1.24 scene_mod.h,1.5,1.6 script.cpp,1.15,1.16 script.h,1.8,1.9 sdata.cpp,1.11,1.12 sdebug.cpp,1.10,1.11 sfuncs.cpp,1.10,1.11 sfuncs.h,1.4,1.5 sndres.cpp,1.18,1.19 sndres.h,1.9,1.10 sound.cpp,1.9,1.10 sound.h,1.6,1.7 sprite.cpp,1.12,1.13 sstack.cpp,1.5,1.6 sstack.h,1.2,1.3 sthread.cpp,1.16,1.17 sthread.h,1.5,1.6 text.cpp,1.4,1.5 transitions.cpp,1.6,1.7 ys_dl_list.cpp,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common config-manager.h,1.11,1.11.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list