Changeset 7631 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc

Timestamp:

May 17, 2006, 8:28:23 AM (18 years ago)

Author:

rennerc

Message:

synchronisation should work now

File:

• branches/network/src/lib/network/network_stream.cc (modified) (8 diffs)

branches/network/src/lib/network/network_stream.cc

@@ -62 +62 @@
   this->init();
   this->peers[0].socket = new UdpSocket( host, port );
+  this->peers[0].userId = 0;
+  this->peers[0].isServer = true;
   this->networkProtocol = new NetworkProtocol();
   this->connectionMonitor = new ConnectionMonitor();
@@ -357 +359 @@
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
+      peers[clientId].isServer = false;
     } else
     {
@@ -369 +372 @@
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
+      peers[clientId].isServer = false;
       
       PRINTF(0)("num sync: %d\n", synchronizeables.size());
@@ -400 +404 @@
         delete it->second.handshake;
       it->second.handshake = NULL;
-
+      
+      for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )
+      {
+        (*it2)->cleanUpUser( it->second.userId );
+      }
 
       NetworkGameManager::getInstance()->signalLeftPlayer(it->second.userId);
@@ -632 +640 @@
         int leafClassId;
         if ( INTSIZE > length - offset )
-          break;
+        {
+          offset += syncDataLength;
+          continue;
+        }
         
         Converter::byteArrayToInt( buf + offset, &leafClassId );
@@ -639 +650 @@
         /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
         /* Exception 1: NullParent */
-        if( leafClassId == CL_NULL_PARENT)
-        {
-          PRINTF(1)("Can not create Class with ID %x!", (int)leafClassId);
-          break;
+        if( leafClassId == CL_NULL_PARENT || leafClassId == CL_SYNCHRONIZEABLE )
+        {
+          PRINTF(1)("Can not create Class with ID %x!\n", (int)leafClassId);
+          offset += syncDataLength;
+          continue;
         }
         else
@@ -650 +662 @@
         {
           PRINTF(1)("Could not fabricate Object with classID %x\n", leafClassId);
-          break;
+          offset += syncDataLength;
+          continue;
         }
         
@@ -663 +676 @@
         else
         {
-          PRINTF(1)("Class with ID %x is not a synchronizeable!", (int)leafClassId);
+          PRINTF(1)("Class with ID %x is not a synchronizeable!\n", (int)leafClassId);
           delete b;
-          break;
+          offset += syncDataLength;
+          continue;
         }
       }