Changeset 1491 for code/branches/network/src/orxonox

Timestamp:

May 31, 2008, 11:48:01 AM (17 years ago)

Author:

scheusso

Message:

enet is not threadsafe (catched that now); some first step towards dedicated server

Location:

code/branches/network/src/orxonox

Files:

• Orxonox.cc (modified) (5 diffs)
• Orxonox.h (modified) (1 diff)

code/branches/network/src/orxonox/Orxonox.cc

@@ -186 +186 @@
     else if (mode == "server")
       mode_ = SERVER;
+    else if (mode == "dedicated")
+      mode_= DEDICATED;
     else
     {
@@ -215 +217 @@
   bool Orxonox::start()
   {
-    //if (mode == DEDICATED)
+    //if (mode_ == DEDICATED)
     // do something else
     //else
@@ -433 +435 @@
       // don't forget to call _fireFrameStarted in ogre to make sure
       // everything goes smoothly
-      ogreRoot._fireFrameStarted(evt);
+      if(mode_!=DEDICATED)
+        ogreRoot._fireFrameStarted(evt);
 
       // get current time
@@ -439 +442 @@
       calculateEventTime(now, eventTimes[2]);
 
-      ogreRoot._updateAllRenderTargets(); // only render in non-server mode
+      if(mode_!=DEDICATED)
+        ogreRoot._updateAllRenderTargets(); // only render in non-server mode
 
       // get current time
@@ -449 +453 @@
 
       // again, just to be sure ogre works fine
-      ogreRoot._fireFrameEnded(evt);
+      if(mode_!=DEDICATED)
+        ogreRoot._fireFrameEnded(evt);
           }
 

code/branches/network/src/orxonox/Orxonox.h

@@ -50 +50 @@
     SERVER,
     CLIENT,
-    STANDALONE
+    STANDALONE,
+    DEDICATED
   };