[Scummvm-cvs-logs] SF.net SVN: scummvm: [21451] scummvm/trunk/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Mar 25 11:19:00 CET 2006


Revision: 21451
Author:   sev
Date:     2006-03-25 11:18:09 -0800 (Sat, 25 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21451&view=rev

Log Message:
-----------
- Move AddDefaultDirectory() calls in somon engine to constructor
- Move AddDefaultDirectory() from NewTheme.cpp to main.cpp

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-03-25 11:01:00 UTC (rev 21450)
+++ scummvm/trunk/base/main.cpp	2006-03-25 19:18:09 UTC (rev 21451)
@@ -314,6 +314,11 @@
 	if (ConfMan.hasKey("extrapath", Common::ConfigManager::kApplicationDomain))
 		Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain));
 
+	// Theme-related
+	if (ConfMan.hasKey("themepath")) {
+		Common::File::addDefaultDirectory(ConfMan.get("themepath"));
+	}
+
 	// As a last resort add current directory and lock further additions
 	Common::File::addDefaultDirectory(".", true);
 

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-03-25 11:01:00 UTC (rev 21450)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-03-25 19:18:09 UTC (rev 21451)
@@ -453,10 +453,7 @@
 	memcpy (_hebrew_char_widths,
 		"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
 
-}
 
-int SimonEngine::init(GameDetector &detector) {
-
 	// Add default file directories for Acorn version
 	File::addDefaultDirectory(_gameDataPath + "execute/");
 	File::addDefaultDirectory(_gameDataPath + "EXECUTE/");
@@ -471,7 +468,10 @@
 	File::addDefaultDirectory(_gameDataPath + "SFX/");
 	File::addDefaultDirectory(_gameDataPath + "speech/");
 	File::addDefaultDirectory(_gameDataPath + "SPEECH/");
+}
 
+int SimonEngine::init(GameDetector &detector) {
+
 	// Detect game
 	if (!initGame()) {
 		return -1;

Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-03-25 11:01:00 UTC (rev 21450)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-03-25 19:18:09 UTC (rev 21451)
@@ -131,12 +131,6 @@
 		}
 	}
 
-	if (ConfMan.hasKey("extrapath")) {
-		Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
-	}
-	if (ConfMan.hasKey("themepath")) {
-		Common::File::addDefaultDirectory(ConfMan.get("themepath"));
-	}
 	ImageMan.addArchive(stylefile + ".zip");
 
 	if (!_configFile.loadFromFile(stylefile + ".ini")) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list