[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.5,1.6 engine.h,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Fri Oct 10 06:56:13 CEST 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv26276/base

Modified Files:
	engine.cpp engine.h 
Log Message:
some cleanup

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- engine.cpp	10 Oct 2003 10:42:54 -0000	1.5
+++ engine.cpp	10 Oct 2003 13:55:05 -0000	1.6
@@ -25,6 +25,7 @@
 #include "base/engine.h"
 #include "base/gameDetector.h"
 #include "common/config-manager.h"
+#include "common/file.h"
 #include "common/timer.h"
 #include "sound/mixer.h"
 
@@ -32,13 +33,14 @@
 Engine *g_engine = 0;
 
 Engine::Engine(GameDetector *detector, OSystem *syst)
-	: _system(syst) {
+	: _system(syst), _gameDataPath(ConfMan.get("path")) {
 	g_engine = this;
 	_mixer = detector->createMixer();
 
-	_gameDataPath = strdup(ConfMan.get("path").c_str());	// FIXME - leak. Just conver to a String?
-
 	_timer = g_timer;
+	
+	// Set default file directory
+	File::setDefaultDirectory(_gameDataPath);
 }
 
 Engine::~Engine() {

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- engine.h	10 Oct 2003 10:42:37 -0000	1.4
+++ engine.h	10 Oct 2003 13:55:05 -0000	1.5
@@ -22,6 +22,7 @@
 #define ENGINE_H
 
 #include "common/scummsys.h"
+#include "common/str.h"
 #include "common/system.h"
 
 extern const char *gScummVMVersion;		// e.g. "0.4.1"
@@ -67,7 +68,7 @@
 	Timer * _timer;
 
 protected:
-	const char *_gameDataPath;
+	const Common::String _gameDataPath;
 
 public:
 	Engine(GameDetector *detector, OSystem *syst);





More information about the Scummvm-git-logs mailing list