Changeset 6683 in orxonox.OLD for branches

Timestamp:

Jan 24, 2006, 11:21:02 PM (19 years ago)

Author:

patrick

Message:

newtork: singleplayer does work again

Location:

branches/network/src

Files:

• lib/network/synchronizeable.cc (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)

branches/network/src/lib/network/synchronizeable.cc

@@ -20 +20 @@
 #include "network_stream.h"
 #include "netdefs.h"
+
+#include "state.h"
 
 #include "assert.h"
@@ -43 +45 @@
   this->bSynchronize = false;
 
-  NetworkStream* nd = SharedNetworkData::getInstance()->getDefaultSyncStream();
-  assert(nd != NULL);
-  nd->connectSynchronizeable(*this);
-  this->setUniqueID(SharedNetworkData::getInstance()->getNewUniqueID());
+  if( State::isOnline())
+  {
+    NetworkStream* nd = SharedNetworkData::getInstance()->getDefaultSyncStream();
+    assert(nd != NULL);
+    nd->connectSynchronizeable(*this);
+    this->setUniqueID(SharedNetworkData::getInstance()->getNewUniqueID());
+  }
 }
 

branches/network/src/orxonox.cc

@@ -56 +56 @@
 
 #include "network_manager.h"
+
+#include "state.h"
 
 #include <string.h>
@@ -276 +278 @@
 
   if( this->serverName != NULL) // we are a client
+  {
     NetworkManager::getInstance()->establishConnection(this->serverName, port);
+    State::setOnline(true);
+  }
   else if( this->port > 0) {    // we are a server
     NetworkManager::getInstance()->createServer(port);
+    State::setOnline(true);
   }
   return 0;