Changeset 2171 for code/trunk/src/orxonox/gamestates/GSDedicated.cc

Timestamp:

Nov 10, 2008, 12:05:03 AM (17 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/GSDedicated.cc (modified) (2 diffs)

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;