Changeset 3245 for code/branches/core4/src/core

Timestamp:

Jun 29, 2009, 1:32:40 PM (16 years ago)

Author:

rgrieder

Message:

Moved Game::getLevel to LevelManager::getStartLevel and Game::setLevel to LevelManager::setStartLevel.

Location:

code/branches/core4/src/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Game.cc (modified) (1 diff)
• Game.h (modified) (4 diffs)

code/branches/core4/src/core/CMakeLists.txt

@@ -68 +68 @@
   TOLUA_FILES
     CommandExecutor.h
-    Game.h
     LuaBind.h
   DEFINE_SYMBOL

code/branches/core4/src/core/Game.cc

@@ -149 +149 @@
         SetConfigValue(statisticsAvgLength_, 1000000)
             .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
-        SetConfigValue(levelName_, "presentation_dm.oxw")
-            .description("Sets the preselection of the level in the main menu.");
-    }
-
-    void Game::setLevel(std::string levelName)
-    {
-        ModifyConfigValue(levelName_, set, levelName);
-    }
-
-    std::string Game::getLevel()
-    {
-        std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        if (levelName == "")
-            return levelName_;
-        else
-            return levelName;
     }
 

code/branches/core4/src/core/Game.h

@@ -64 +64 @@
         Main class responsible for running the game.
     */
-    class _CoreExport Game
-    // tolua_end
-        : public OrxonoxClass
-    // tolua_begin
+    class _CoreExport Game : public OrxonoxClass
     {
-    //tolua_end
     public:
         Game(int argc, char** argv);
@@ -94 +90 @@
         template <class T>
         static bool declareGameState(const std::string& className, const std::string& stateName, bool bIgnoreTickTime, bool bConsoleMode);
-        static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; } //tolua_export
-
-        void setLevel(std::string levelName); //tolua_export
-        std::string getLevel(); //tolua_export
+        static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
     private:
@@ -163 +156 @@
         unsigned int                    statisticsRefreshCycle_;
         unsigned int                    statisticsAvgLength_;
-        std::string                     levelName_;
 
         static std::map<std::string, GameStateInfo> gameStateDeclarations_s;
         static Game* singletonRef_s;        //!< Pointer to the Singleton
-    }; // tolua_export
+    };
 
     template <class T>
@@ -193 +185 @@
         return true;
     }
-} // tolua_export
+}
 
 #endif /* _Game_H__ */