Changeset 7743 for code/branches/presentation/src/orxonox

Timestamp:

Dec 8, 2010, 5:13:03 PM (15 years ago)

Author:

smerkli

Message:

made mastserserver mode non-blocking

Location:

code/branches/presentation/src/orxonox

Files:

• Main.cc (modified) (1 diff)
• gamestates/GSMasterServer.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/Main.cc

@@ -77 +77 @@
             "  standalone,server,client"
             "   level"
-            " server,client"
+            " server,client,masterserver"
             "  level"
             );

code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc

@@ -63 +63 @@
 
   void GSMasterServer::update(const Clock& time)
-  { /* nothing so far */ }
+  { 
+    this->mserver->run();
+  }
 }