Changeset 6257 in orxonox.OLD for branches/network/src/lib/network

Timestamp:

Dec 21, 2005, 11:58:57 PM (19 years ago)

Author:

rennerc

Message:

class_id.h: changed CL_ENTITY_MANAGER to CL_NETWORK_GAME_MANAGER
base_object: added realClassID which can be used with factory
network_game_manager: fixed some bugs again, can now spawn entities over network

File:

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

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

@@ -41 +41 @@
 
   /* set the class id for the base object */
-  this->setClassID(CL_ENTITY_MANAGER, "EntityManager");
+  this->setClassID(CL_NETWORK_GAME_MANAGER, "EntityManager");
 
   allOutBuffer.length = 0;
@@ -145 +145 @@
   for ( int i = 0; i<outBuffer.size(); i++ )
   {
+    *reciever = i;
     if ( outBuffer[i].length>0 )
     {
       int nbytes = outBuffer[i].length;
+      outBuffer[i].length = 0;
 
       if ( nbytes > maxLength )
@@ -160 +162 @@
   }
 
+  *reciever = 0;
   int nbytes = allOutBuffer.length;
+  allOutBuffer.length = 0;
 
   if ( nbytes <=0 )
@@ -360 +364 @@
     return;
 
-  if ( !writeToClientBuffer( outBuffer[userID], networkStream->getSyncCount() ) )
-    return;
-
-  PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount());
+  // -2 because you must not send network_game_manager and handshake
+  if ( !writeToClientBuffer( outBuffer[userID], networkStream->getSyncCount()-2 ) )
+    return;
+
+  PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
 
   while ( it != e )
   {
-    if ( !writeToClientBuffer( outBuffer[userID], (*it)->getClassID() ) )
-      return;
-
-    PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getClassID());
-
-    if ( !writeToClientBuffer( outBuffer[userID], (*it)->getUniqueID() ) )
-      return;
-
-    if ( !writeToClientBuffer( outBuffer[userID], (*it)->getOwner() ) )
-      return;
+    if ( (*it)->getRealClassID() != CL_NETWORK_GAME_MANAGER && (*it)->getRealClassID() != CL_HANDSHAKE )
+    {
+
+      if ( !writeToClientBuffer( outBuffer[userID], (*it)->getRealClassID() ) )
+        return;
+
+      PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getRealClassID());
+
+      if ( !writeToClientBuffer( outBuffer[userID], (*it)->getUniqueID() ) )
+        return;
+
+      if ( !writeToClientBuffer( outBuffer[userID], (*it)->getOwner() ) )
+        return;
+    }
 
     it++;