Changeset 6424 in orxonox.OLD for trunk/src/lib/network/network_game_manager.cc

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:

• trunk/src/lib/network/network_game_manager.cc (modified) (10 diffs)

trunk/src/lib/network/network_game_manager.cc

@@ -23 +23 @@
 #include "network_stream.h"
 #include "converter.h"
+
+#include "p_node.h"
+
 
 /* include your own header */
@@ -237 +240 @@
  * @param classID: The ID of the class of which an entity should be created
  */
-BaseObject* NetworkGameManager::createEntity( TiXmlElement* element)
+BaseObject* NetworkGameManager::createEntity(const TiXmlElement* element)
 {
   if ( this->isServer() )
@@ -252 +255 @@
     if ( !b )
     {
-      PRINTF(1)("Could not fabricate Object with classID %x\n", element->Value() );
+      PRINTF(1)("Could not fabricate Object with className %s\n", element->Value() );
       return NULL;
     }
@@ -391 +394 @@
   //PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
 
+  int n = 0;
+
   while ( it != e )
   {
@@ -403 +408 @@
     if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
       return;
+
+
+    PRINTF(0)("id = %x %s %s\n", (int)((*it)->getLeafClassID()), (*it)->getClassName(), (*it)->getName());
+
+
+    /*if ( (*it)->isA(CL_WORLD_ENTITY) )
+    {
+      n = dynamic_cast<WorldEntity*>((*it))->readState( outBuffer[userID].buffer, outBuffer[userID].maxLength-outBuffer[userID].length );
+      if ( n = 0 )
+      {
+        PRINTF(2)("n = 0\n");
+      }
+      outBuffer[userID].length += n;
+  }*/
 
     it++;
@@ -436 +455 @@
  * @param owner: owner of this synchronizealbe
  */
-void NetworkGameManager::doCreateEntity( ClassID classID, int uniqueID, int owner )
+BaseObject* NetworkGameManager::doCreateEntity( ClassID classID, int uniqueID, int owner )
 {
   BaseObject * b = Factory::fabricate( classID );
@@ -443 +462 @@
   {
     PRINTF(1)("Could not fabricate Object with classID %x\n", classID);
-    return;
+    return NULL;
   }
 
@@ -455 +474 @@
       s->setIsOutOfSync( true );
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
+    return b;
   }
   else
@@ -461 +481 @@
     delete b;
   }
+  return NULL;
 }
 
@@ -695 +716 @@
     i += Converter::byteArrayToInt( &data[i], &owner );
 
+    PRINTF(0)("before fabricate\n");
     if ( classID != CL_NETWORK_GAME_MANAGER && classID != CL_HANDSHAKE )
-      doCreateEntity( (ClassID)classID, uniqueID, owner );
-
-  }
+    {
+      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;
+        }
+    }*/
+    }
+
+  }
+
   return true;
 }