Changeset 5782 for sandbox/src/libraries/core/Game.cc

Timestamp:

Sep 24, 2009, 11:32:39 AM (15 years ago)

Author:

rgrieder

Message:

Applied changes to the real sandbox this time.

File:

• sandbox/src/libraries/core/Game.cc (modified) (3 diffs)

sandbox/src/libraries/core/Game.cc

@@ -45 +45 @@
 #include "Clock.h"
 #include "CommandLine.h"
-#include "ConsoleCommand.h"
 #include "Core.h"
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
-#include "GameMode.h"
 #include "GameState.h"
 
 namespace orxonox
 {
-    static void stop_game()
-        { Game::getInstance().stop(); }
-    SetConsoleCommandShortcutExternAlias(stop_game, "exit");
-
     std::map<std::string, GameStateInfo> Game::gameStateDeclarations_s;
     Game* Game::singletonPtr_s = 0;
@@ -506 +500 @@
     void Game::loadGraphics()
     {
-        if (!GameMode::bShowsGraphics_s)
-        {
-            core_->loadGraphics();
-            Loki::ScopeGuard graphicsUnloader = Loki::MakeObjGuard(*this, &Game::unloadGraphics);
-            GameMode::bShowsGraphics_s = true;
-
-            // Construct all the GameStates that require graphics
-            for (std::map<std::string, GameStateInfo>::const_iterator it = gameStateDeclarations_s.begin();
-                it != gameStateDeclarations_s.end(); ++it)
-            {
-                if (it->second.bGraphicsMode)
-                {
-                    // Game state loading failure is serious --> don't catch
-                    shared_ptr<GameState> gameState = GameStateFactory::fabricate(it->second);
-                    if (!constructedStates_.insert(std::make_pair(
-                        it->second.stateName, gameState)).second)
-                        assert(false); // GameState was already created!
-                }
-            }
-            graphicsUnloader.Dismiss();
-        }
     }
 
     void Game::unloadGraphics()
     {
-        if (GameMode::bShowsGraphics_s)
-        {
-            // Destroy all the GameStates that require graphics
-            for (GameStateMap::iterator it = constructedStates_.begin(); it != constructedStates_.end();)
-            {
-                if (it->second->getInfo().bGraphicsMode)
-                    constructedStates_.erase(it++);
-                else
-                    ++it;
-            }
-
-            core_->unloadGraphics();
-            GameMode::bShowsGraphics_s = false;
-        }
     }
 
@@ -563 +522 @@
         // If state requires graphics, load it
         Loki::ScopeGuard graphicsUnloader = Loki::MakeObjGuard(*this, &Game::unloadGraphics);
-        if (gameStateDeclarations_s[name].bGraphicsMode && !GameMode::showsGraphics())
+        if (gameStateDeclarations_s[name].bGraphicsMode)
             this->loadGraphics();
         else