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

Timestamp:

Jan 25, 2006, 1:35:29 AM (18 years ago)

Author:

patrick

Message:

network: some more degbug ability for pnode, started work on water synchronization

File:

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

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

@@ -407 +407 @@
   e = this->networkStream->getSyncEnd();
 
+  // send the packet header
   if ( !writeToClientBuffer( outBuffer[userID], (byte)NET_CREATE_ENTITY_LIST ) )
     return;
 
-  // -2 because you must not send network_game_manager and handshake
+  // send the number of entities: -2 because you must not send network_game_manager and handshake
   if ( !writeToClientBuffer( outBuffer[userID], networkStream->getSyncCount() ) )
     return;
@@ -416 +417 @@
   //PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
 
-  int n = 0;
-
+  // first send the NullParent
+  if ( !writeToClientBuffer( outBuffer[userID], (int)PNode::getNullParent()->getLeafClassID()) )
+    return;
+  if ( !writeToClientBuffer( outBuffer[userID], (int)PNode::getNullParent()->getUniqueID()) )
+    return;
+  if ( !writeToClientBuffer( outBuffer[userID], (int)PNode::getNullParent()->getOwner()) )
+    return;
+
+  // now send the rest of the entities
   while ( it != e )
   {
-    if( (*it)->beSynchronized())
+    if( (*it)->beSynchronized() && (*it) != PNode::getNullParent())
     {
       PRINTF(0)("SENDING ENTITY %s classid: %x, uniqueid %d\n", (*it)->getClassName(), (*it)->getLeafClassID(), (*it)->getUniqueID() );
@@ -489 +497 @@
   if( classID == CL_NULL_PARENT)
   {
-    b = PNode::getNullParent();
+    b = (BaseObject*)PNode::getNullParent();
   }
   else
@@ -806 +814 @@
     {
       BaseObject* b = doCreateEntity( (ClassID)classID, uniqueID, owner );
-
-      /*if ( b != NULL )
-      {
-        if ( b->isA(CL_WORLD_ENTITY) )
-        {
-          int n = dynamic_cast<WorldEntity*>(b)->writeState( data, length, sender );
-
-          i += n;
-        }
-    }*/
     }