Changeset 2171 for code/trunk/src/orxonox/gamestates

Timestamp:

Nov 10, 2008, 12:05:03 AM (16 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSClient.cc (modified) (1 diff)
• src/orxonox/gamestates/GSClient.h (modified) (1 diff)
• src/orxonox/gamestates/GSDedicated.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSDedicated.h (modified) (1 diff)
• src/orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSRoot.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSServer.cc (modified) (1 diff)
• src/orxonox/gamestates/GSServer.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSClient.cc

@@ -53 +53 @@
         Core::setIsClient(true);
 
-        this->client_ = new network::Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
 
         if(!client_->establishConnection())

code/trunk/src/orxonox/gamestates/GSClient.h

@@ -49 +49 @@
         void ticked(const Clock& time);
 
-        network::Client* client_;
+        Client* client_;
     };
 }

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -32 +32 @@
 #include "core/CommandLine.h"
 #include "core/Core.h"
+#include "core/Iterator.h"
 #include "network/Server.h"
+#include "objects/Tickable.h"
 
 namespace orxonox
@@ -50 +52 @@
         Core::setHasServer(true);
 
-        this->server_ = new network::Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLine::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 

code/trunk/src/orxonox/gamestates/GSDedicated.h

@@ -48 +48 @@
         void ticked(const Clock& time);
 
-        network::Server*      server_;
+        Server*      server_;
     };
 }

code/trunk/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/trunk/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);
     }

code/trunk/src/orxonox/gamestates/GSServer.cc

@@ -52 +52 @@
         Core::setHasServer(true);
 
-        this->server_ = new network::Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLine::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 

code/trunk/src/orxonox/gamestates/GSServer.h

@@ -48 +48 @@
         void ticked(const Clock& time);
 
-        network::Server*      server_;
+        Server*      server_;
     };
 }