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

Timestamp:

May 11, 2006, 8:05:17 AM (18 years ago)

Author:

rennerc

Message:

fixed some bugs

File:

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

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

@@ -142 +142 @@
   peers[0].handshake = hs;
 //   peers[0].handshake->setSynchronized( true );
-  this->connectSynchronizeable(*hs);
+  //this->connectSynchronizeable(*hs);
   //this->connectSynchronizeable(*hs);
   PRINTF(0)("NetworkStream: Handshake created: %s\n", hs->getName());
@@ -508 +508 @@
     {
       Synchronizeable & sync = **it;
-
+      
       if ( !sync.beSynchronized() || sync.getUniqueID() < 0 )
         continue;
@@ -515 +515 @@
       if ( peer->second.handshake && sync.getLeafClassID() != CL_HANDSHAKE )
         continue;
-
-      PRINTF(0)("syncing: id:%d name:%s\n", sync.getUniqueID(), sync.getClassName());
-      
+      
+      if ( isServer() && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+        continue;
+
       assert( offset + INTSIZE <= UDP_PACKET_SIZE );
       
@@ -644 +645 @@
         }
       }
-      
       offset += sync->setStateDiff( peer->second.userId, buf+offset, length-offset, state, fromState );
     }