[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.38,1.39 main.cpp,1.79,1.80

Max Horn fingolfin at users.sourceforge.net
Tue May 10 15:59:45 CEST 2005


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/base

Modified Files:
	engine.cpp main.cpp 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- engine.cpp	10 Apr 2005 16:55:37 -0000	1.38
+++ engine.cpp	10 May 2005 22:55:46 -0000	1.39
@@ -42,13 +42,13 @@
 	_timer = g_timer;
 
 	// Add default file directory
-	File::addDefaultDirectory(_gameDataPath);
+	Common::File::addDefaultDirectory(_gameDataPath);
 
 	_saveFileMan = _system->getSavefileManager();
 }
 
 Engine::~Engine() {
-	File::resetDefaultDirectories();
+	Common::File::resetDefaultDirectories();
 
 	delete _mixer;
 	delete _saveFileMan;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- main.cpp	9 May 2005 21:21:17 -0000	1.79
+++ main.cpp	10 May 2005 22:55:46 -0000	1.80
@@ -279,10 +279,10 @@
 	
 	// Add extrapath (if any) to the directory search list
 	if (ConfMan.hasKey("extrapath"))
-		File::addDefaultDirectory(ConfMan.get("extrapath"));
+		Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
 
 	if (ConfMan.hasKey("extrapath", Common::ConfigManager::kApplicationDomain))
-		File::addDefaultDirectory(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain));
+		Common::File::addDefaultDirectory(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain));
 
 	int result;
 





More information about the Scummvm-git-logs mailing list