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

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 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/GSDedicated.cc (copied) (copied from code/branches/gui/src/orxonox/gamestates/GSDedicated.cc) (4 diffs)

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

@@ -70 +70 @@
 
         int serverPort = CommandLine::getArgument<int>("port")->getValue();
-        this->server_ = network::Server::createSingleton(serverPort);
+        this->server_ = new network::Server(serverPort);
 
         // call the loader
@@ -82 +82 @@
         FunctorMember01<GSDedicated, float>* functor = createFunctor(&GSDedicated::setTimeFactor);
         functor->setObject(this);
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor"));
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor, "setTimeFactor")).accessLevel(AccessLevel::Offline).defaultValue(0, 1.0);;
     }
 
@@ -93 +93 @@
 
         this->server_->close();
-        // TODO: destroy server
+        delete this->server_;
 
         Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
@@ -103 +103 @@
     {
         // Call those objects that need the real time
-        for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
+        for (ObjectList<TickableReal>::iterator it = ObjectList<TickableReal>::begin(); it; ++it)
             it->tick(time.getDeltaTime());
         // Call the scene objects
-        for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
+        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
             it->tick(time.getDeltaTime() * this->timeFactor_);