Changeset 2846 for code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Mar 25, 2009, 6:24:15 PM (15 years ago)

Author:

rgrieder

Message:

Moving game clock from Core to Game.
Other small fixes.

File:

• code/branches/gui/src/orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

@@ -113 +113 @@
     void GSGraphics::deactivate()
     {
-        if (Core::showsGraphics())
-            InputManager::getInstance().requestLeaveState("master");
+        InputManager::getInstance().requestLeaveState("master");
 
         delete this->guiManager_;
@@ -129 +128 @@
         delete graphicsManager_;
 
-        if (Core::showsGraphics())
+        masterInputState_->setHandler(0);
+        InputManager::getInstance().requestDestroyState("master");
+        if (this->masterKeyBinder_)
         {
-            masterInputState_->setHandler(0);
-            InputManager::getInstance().requestDestroyState("master");
-            if (this->masterKeyBinder_)
-            {
-                delete this->masterKeyBinder_;
-                this->masterKeyBinder_ = 0;
-            }
+            delete this->masterKeyBinder_;
+            this->masterKeyBinder_ = 0;
         }
+
+        Core::setShowsGraphics(false);
     }