Changeset 6273 in orxonox.OLD for branches/network/src/lib/network/network_game_manager.cc

Timestamp:

Dec 23, 2005, 5:30:22 PM (18 years ago)

Author:

rennerc

Message:

converter: added functions for strings
network_protocol: length and id are now int
network_game_manager: fixed some more bugs
skybox: is loaded on client corectly now

File:

• branches/network/src/lib/network/network_game_manager.cc (modified) (6 diffs)

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

@@ -353 +353 @@
     return;
 
-  if ( userID > outBuffer.size() )
+  if ( userID >= outBuffer.size() )
     resizeBufferVector( userID );
 
@@ -368 +368 @@
     return;
 
-  PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
+  //PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
 
   while ( it != e )
@@ -378 +378 @@
         return;
 
-      PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getRealClassID());
+      //PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getRealClassID());
 
       if ( !writeToClientBuffer( outBuffer[userID], (*it)->getUniqueID() ) )
@@ -428 +428 @@
   else
   {
-    PRINTF(0)("Fabricated entity: %s\n", b->getClassName());
+    //PRINTF(0)("Fabricated entity: %s\n", b->getClassName());
   }
 
@@ -437 +437 @@
     s->setOwner( owner );
     this->networkStream->connectSynchronizeable( *s );
+    if ( !isServer() )
+      s->setIsOutOfSync( true );
   }
   else
@@ -769 +771 @@
 }
 
+void NetworkGameManager::sync( int uniqueID, int owner )
+{
+  if ( owner==this->getHostID() )
+    return;
+
+  if ( !isServer() )
+    executeRequestSync( uniqueID, 0 );
+  else
+    executeRequestSync( uniqueID, owner );
+}
+
+void NetworkGameManager::executeRequestSync( int uniqueID, int user )
+{
+  if ( user >= outBuffer.size() )
+    resizeBufferVector( user );
+
+  if ( !writeToClientBuffer( outBuffer[user], (byte)REQUEST_SYNC ) )
+    return;
+  if ( !writeToClientBuffer( outBuffer[user], uniqueID ) )
+    return;
+}
+