X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.hh;fp=src%2FMoof%2FSettings.hh;h=42ef70ce54719d2431e0a9260899d63ecc658209;hp=f7503dd7b8d1f34806b5ccce86a185ababdb3065;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=ed5fcf5f1357fc42749408f705e9ec55531ff006

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index f7503dd..42ef70c 100644
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -33,10 +33,13 @@ class Settings
 {
 public:
 
-	Settings()
+	Settings(int argc, char* argv[], const std::string& path)
 	{
 		mScript.importBaseLibrary();
 		importLogFunctions(mScript);
+
+		parseArgs(argc, argv);
+		loadFromFiles(path);
 	}
 
 	~Settings();
@@ -93,9 +96,6 @@ bool Settings::get(const std::string& key, T& value) const
 }
 
 
-extern Settings settings;
-
-
 } // namepsace Mf
 
 #endif // _MOOF_SETTINGS_HH_