Changeset 6674 in orxonox.OLD

Timestamp:

Jan 24, 2006, 4:11:16 PM (18 years ago)

Author:

patrick

Message:

network: NullParent now is also synced over network, some more debug output and other minor changes

Location:

branches/network/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (4 diffs)
• world_entities/weapons/weapon.cc (modified) (1 diff)

branches/network/src/lib/coord/p_node.cc

@@ -696 +696 @@
   {
     PNode::nullParent = new PNode(NULL, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_TO_NULL);
+    PNode::nullParent->setClassID(CL_NULL_PARENT, "NullParent");
     PNode::nullParent->setName("NullParent");
     PNode::nullParent->setSynchronized(true);

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

@@ -354 +354 @@
   }
 
+  PRINTF(0)("ExecuteCreateEntity: server side: classID: %x, uniqueID: %i, owner: %i\n", classID, uniqueID, owner);
   doCreateEntity( classID, uniqueID, owner );
 
@@ -421 +422 @@
     if( (*it)->beSynchronized())
     {
-      PRINTF(0)("SENDING ENTITY %s id %d\n", (*it)->getClassName(), (*it)->getUniqueID() );
+      PRINTF(0)("SENDING ENTITY %s classid: %x, uniqueid %d\n", (*it)->getClassName(), (*it)->getLeafClassID(), (*it)->getUniqueID() );
       if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getLeafClassID()) ) )
         return;
@@ -481 +482 @@
 BaseObject* NetworkGameManager::doCreateEntity( ClassID classID, int uniqueID, int owner )
 {
-  BaseObject * b = Factory::fabricate( classID );
+  PRINTF(0)("Creating Entity via Factory: classid: %x, uniqueID: %i, owner: %i\n", classID, uniqueID, owner);
+
+  BaseObject * b;
+  /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
+  /* Exception 1: NullParent */
+  if( classID == CL_NULL_PARENT)
+  {
+    b = PNode::getNullParent();
+  }
+  else
+    b = Factory::fabricate( classID );
 
   if ( !b )
@@ -729 +740 @@
   i += Converter::byteArrayToInt( &data[i], &owner );
 
+  PRINTF(0)("handleCreateEntity: client side: classID: %x, uniqueID: %i, owner: %i\n", classID, uniqueID, owner);
   doCreateEntity( (ClassID)classID, uniqueID, owner );
 

branches/network/src/world_entities/weapons/weapon.cc

@@ -105 +105 @@
 
   // set this object to be synchronized over network
-  this->setSynchronized(true);
+  //this->setSynchronized(true);
 }