settings subsystem now using lua

[chaz/yoink] / src / Moof / Engine.cc

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index e97c8b5d1b7edbae52a5b48ebc1072574e697ebe..18ce5d7e5f8c6d0b4664da080b16ba1ad2623ace 100644 (file)
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -51,7 +51,9 @@ public:
        Impl(int argc, char* argv[], const std::string& configFile,
                        const std::string& name, const std::string& iconFile,
                        Engine* outer) :
-               interface(outer)
+               interface(outer),
+               timestep(0.01),
+               printFps(false)
        {
 #if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
                if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)
@@ -70,23 +72,20 @@ public:
                alutInit(&argc, argv);
 
                Settings& settings = Settings::getInstance();
-               settings.parseArgs(argc, argv);
                settings.loadFromFile(configFile);
+               settings.parseArgs(argc, argv);
 
                long randomSeed;
-               if (settings.get("engine.rngseed", randomSeed)) setSeed(randomSeed);
+               if (settings.get("rngseed", randomSeed)) setSeed(randomSeed);
                else setSeed();
 
-               double ts = 0.01;
-               settings.get("engine.timestep", ts);
-               timestep = Scalar(ts);
+               settings.get("timestep", timestep);
 
                long maxFps = 40;
-               settings.getNumber("video.maxfps", maxFps);
+               settings.get("maxfps", maxFps);
                drawRate = 1.0 / Scalar(maxFps);
 
-               printFps = false;
-               settings.get("video.printfps", printFps);
+               settings.get("printfps", printFps);
 
                video = Video::alloc(name, iconFile);
                video->makeActive();
@@ -169,7 +168,7 @@ public:
 
                                        if (printFps)
                                        {
-                                               logInfo("framerate: %d fps", fps);
+                                               logInfo("%d fps", fps);
                                        }
                                }