Changeset 1755 for code/trunk/src/orxonox/gamestates/GSServer.cc

Timestamp:

Sep 10, 2008, 1:37:36 AM (17 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates (copied) (copied from code/branches/gui/src/orxonox/gamestates)
• src/orxonox/gamestates/GSServer.cc (copied) (copied from code/branches/gui/src/orxonox/gamestates/GSServer.cc) (3 diffs)

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

@@ -57 +57 @@
 
         int serverPort = CommandLine::getArgument<int>("port")->getValue();
-        this->server_ = network::Server::createSingleton(serverPort);
+        this->server_ = new network::Server(serverPort);
+        COUT(0) << "Loading scene in server mode" << std::endl;
 
         this->loadLevel();
@@ -66 +67 @@
         FunctorMember<GSLevel>* functor = createFunctor(&GSLevel::setTimeFactor);
         functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor")).accessLevel(AccessLevel::Offline).defaultValue(0, 1.0);;
 
         // level is loaded: we can start capturing the input
@@ -81 +82 @@
 
         this->server_->close();
-        // TODO: destroy server
+        delete this->server_;
 
         GSLevel::leave();