Changeset 2846 for code/branches/gui/src/orxonox

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (1 diff)
• GSGraphics.cc (modified) (2 diffs)
• GSRoot.cc (modified) (1 diff)

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

@@ -62 +62 @@
             ThrowException(InitialisationFailed, "Could not establish connection with server.");
 
-        client_->update(Core::getGameClock());
+        client_->update(Game::getInstance().getGameClock());
     }
 

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);
     }
 

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

@@ -115 +115 @@
         uint64_t timeBeforeTick = time.getRealMicroseconds();
 
-        Core::getInstance().update(time);
-
         for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
             it->tick(time);