[Scummvm-cvs-logs] CVS: scummvm/simon simon.h,1.28,1.29 simon.cpp,1.50,1.51 simonres.cpp,1.5,1.6
Max Horn
fingolfin at users.sourceforge.net
Sun Aug 18 15:48:03 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm engine.cpp,1.3,1.4 engine.h,1.3,1.4 insane.cpp,1.58,1.59 saveload.cpp,1.59,1.60 scumm.h,1.206,1.207 scummvm.cpp,1.207,1.208 sound.cpp,1.127,1.128
- Next message: [Scummvm-cvs-logs] CVS: scummvm config-file.cpp,1.13,1.14 config-file.h,1.6,1.7 gameDetector.cpp,1.84,1.85
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv30668/simon
Modified Files:
simon.h simon.cpp simonres.cpp
Log Message:
more code unification; as a side effect, simon can take advantage of the save path settings in the config file (inspired by patch #587694)
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- simon.h 18 Aug 2002 18:39:42 -0000 1.28
+++ simon.h 18 Aug 2002 22:47:11 -0000 1.29
@@ -110,8 +110,6 @@
class SimonState : public Engine {
public:
- char *_game_path;
-
byte *_vc_ptr; /* video code ptr */
uint32 *_game_offsets_ptr;
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- simon.cpp 18 Aug 2002 18:39:41 -0000 1.50
+++ simon.cpp 18 Aug 2002 22:47:11 -0000 1.51
@@ -126,7 +126,6 @@
midi.set_driver(driver);
_game = detector->_gameId;
- _game_path = detector->_gameDataPath;
/* Setup mixer */
if (!_mixer->bind_to_system(syst))
@@ -4541,16 +4540,7 @@
char *SimonState::gen_savename(int slot)
{
static char buf[256];
- const char *dir;
-
- /* perhaps getenv should be added to OSystem */
-#ifndef _WIN32_WCE
- dir = getenv("SCUMMVM_SAVEPATH");
- if (dir == NULL)
- dir = "";
-#else
- dir = _game_path;
-#endif
+ const char *dir = getSavePath();
sprintf(buf, "%sSAVE.%.3d", dir, slot);
return buf;
Index: simonres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonres.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- simonres.cpp 18 Aug 2002 16:21:08 -0000 1.5
+++ simonres.cpp 18 Aug 2002 22:47:11 -0000 1.6
@@ -97,7 +97,7 @@
{
FILE *in;
char buf[256], dotbuf[256], *e;
- const char *s = _game_path;
+ const char *s = _gameDataPath;
if (filename == NULL || *filename == '\0')
return NULL;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm engine.cpp,1.3,1.4 engine.h,1.3,1.4 insane.cpp,1.58,1.59 saveload.cpp,1.59,1.60 scumm.h,1.206,1.207 scummvm.cpp,1.207,1.208 sound.cpp,1.127,1.128
- Next message: [Scummvm-cvs-logs] CVS: scummvm config-file.cpp,1.13,1.14 config-file.h,1.6,1.7 gameDetector.cpp,1.84,1.85
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list