Changeset 6695 in orxonox.OLD for trunk/src/lib/network/synchronizeable.cc

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

• trunk/src/lib/network/synchronizeable.cc (modified) (9 diffs)

trunk/src/lib/network/synchronizeable.cc

@@ -17 +17 @@
 #define DEBUG_MODULE_NETWORK
 
+#include "shared_network_data.h"
+#include "network_stream.h"
+#include "netdefs.h"
+
+#include "state.h"
+
+#include "assert.h"
+
 #include "synchronizeable.h"
-#include "netdefs.h"
-#include "network_manager.h"
-#include "network_stream.h"
+
 
 
@@ -29 +35 @@
 {
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
-  owner = 0;
-  state = 0;
-  hostID = NetworkManager::getInstance()->getHostID();
+  this->owner = 0;
+  this->state = 0;
+  this->hostID = SharedNetworkData::getInstance()->getHostID();
   this->setIsServer(this->hostID == 0);
-  uniqueID = -1;
+  this->uniqueID = NET_UID_UNASSIGNED;
   this->networkStream = NULL;
   this->setRequestedSync( false );
   this->setIsOutOfSync( !(this->isServer()) );
+  this->bSynchronize = false;
+
+  if( State::isOnline())
+  {
+    NetworkStream* nd = SharedNetworkData::getInstance()->getDefaultSyncStream();
+    assert(nd != NULL);
+    nd->connectSynchronizeable(*this);
+    this->setUniqueID(SharedNetworkData::getInstance()->getNewUniqueID());
+  }
 }
 
@@ -50 +65 @@
 }
 
+
 /**
  *  write data to NetworkStream
@@ -57 +73 @@
   PRINTF(5)("Synchronizeable::writeBytes was called\n");
 }
+
 
 /**
@@ -87 +104 @@
 }
 
+
 /**
  * Sets the outofsync flag to a given value
@@ -100 +118 @@
 }
 
+
 /**
  * Determines if the server flag is set
@@ -108 +127 @@
   return (this->state & STATE_SERVER) >0;
 }
+
 
 /**
@@ -118 +138 @@
 }
 
+
 /**
  * Determines if the requestedSync flag is set
@@ -126 +147 @@
   return (this->state & STATE_REQUESTEDSYNC) >0;
 }
+
 
 /**