Changeset 6662 in orxonox.OLD

Timestamp:

Jan 23, 2006, 4:12:02 PM (18 years ago)

Author:

patrick

Message:

network: now sync is on the road again, clients segfaults on assertion

Location:

branches/network/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• network_game_manager.cc (modified) (3 diffs)
• network_manager.cc (modified) (1 diff)

branches/network/src/lib/network/handshake.cc

@@ -23 +23 @@
 
 Handshake::Handshake( bool server, int clientId, int networkGameManagerId )
+  : Synchronizeable()
 {
   /* set the class id for the base object */

branches/network/src/lib/network/network_game_manager.cc

@@ -249 +249 @@
       s->setUniqueID( newUniqueID++ );
       s->setOwner( 0 );
+      // all entities created via this function are added automaticaly to the synchronizeable list
+      s->setSynchronized(true);
       return b;
     }
@@ -408 +410 @@
   while ( it != e )
   {
-    PRINTF(5)("SENDING ENTITY %s id %d\n", (*it)->getClassName(), (*it)->getUniqueID() );
-    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafClassID()) ) )
-      return;
-
-    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getUniqueID()) ) )
-      return;
-
-    if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
-      return;
-
+    if( (*it)->beSynchronized())
+    {
+      PRINTF(0)("SENDING ENTITY %s id %d\n", (*it)->getClassName(), (*it)->getUniqueID() );
+      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafClassID()) ) )
+        return;
+
+      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getUniqueID()) ) )
+        return;
+
+      if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
+        return;
+    }
     it++;
   }
@@ -481 +485 @@
     s->setUniqueID( uniqueID );
     s->setOwner( owner );
-    this->networkStream->connectSynchronizeable( *s );
+    //this->networkStream->connectSynchronizeable( *s );
     if ( !isServer() )
       s->setIsOutOfSync( true );

branches/network/src/lib/network/network_manager.cc

@@ -101 +101 @@
 
   this->defaultSyncStream = new NetworkStream(ipAddress);
+  this->defaultSyncStream->startHandshake();
   return 1;
 }