Changeset 2163

Timestamp:

Nov 9, 2008, 12:53:57 PM (16 years ago)

Author:

rgrieder

Message:

Hack-fixed hack with Tickables in dedicated mode.

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

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

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.cc

@@ -75 +75 @@
         server_->tick(time.getDeltaTime());
         this->tickChild(time);
-
-        /*** HACK *** HACK ***/
-        // Call the Tickable objects
-        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
-            it->tick(time.getDeltaTime());
-        /*** HACK *** HACK ***/
     }
 }

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

@@ -56 +56 @@
 #include "gui/GUIManager.h"
 #include "tools/WindowEventListener.h"
-#include "objects/Tickable.h"
 #include "Settings.h"
 
@@ -242 +241 @@
         this->tickChild(time);
 
-        /*** HACK *** HACK ***/
-        // Call the Tickable objects
-        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
-            it->tick(time.getDeltaTime());
-        /*** HACK *** HACK ***/
-
         if (this->bWindowEventListenerUpdateRequired_)
         {

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

@@ -41 +41 @@
 #include "core/TclThreadManager.h"
 #include "tools/Timer.h"
+#include "objects/Tickable.h"
 #include "Settings.h"
 
@@ -143 +144 @@
             it->tick(time);
 
+        /*** HACK *** HACK ***/
+        // Call the Tickable objects
+        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
+            it->tick(time.getDeltaTime());
+        /*** HACK *** HACK ***/
+
         this->tickChild(time);
     }