X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FEngine.cc;h=d7d04a846af6bc54753551d1135d582b481fab06;hb=a5f0d391406a68275b41448fc3f49e8d8396c497;hp=78233688d60f69dba90c880a0c9e94b9518f0814;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4;p=chaz%2Fyoink

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index 7823368..d7d04a8 100644
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -35,7 +35,6 @@
 #include <SDL/SDL_sound.h>
 #include <AL/alut.h>
 
-#include "Dispatcher.hh"
 #include "Engine.hh"
 #include "Random.hh"
 #include "Settings.hh"
@@ -52,8 +51,7 @@ public:
 	Impl(int argc, char* argv[], const std::string& configFile,
 			const std::string& name, const std::string& iconFile,
 			Engine* outer) :
-		interface(outer),
-		settings(argc, argv)
+		interface(outer)
 	{
 		if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
 		{
@@ -70,6 +68,8 @@ public:
 		}
 		alutInit(&argc, argv);
 
+		Settings& settings = Settings::getInstance();
+		settings.parseArgs(argc, argv);
 		settings.loadFromFile(configFile);
 
 		long randomSeed;
@@ -219,8 +219,6 @@ public:
 
 	Engine*		interface;
 
-	Settings	settings;
-	Dispatcher	dispatcher;
 	VideoPtr	video;
 
 	bool		running;