Changeset 6257 in orxonox.OLD

Timestamp:

Dec 21, 2005, 11:58:57 PM (18 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

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (4 diffs)

branches/network/src/defs/class_id.h

@@ -238 +238 @@
   CL_CONNECTION_MONITOR         =    0x00000b05,
   CL_HANDSHAKE                  =    0x00000b06,
-  CL_ENTITY_MANAGER             =    0x00000b07,
+  CL_NETWORK_GAME_MANAGER       =    0x00000b07,
 
 

branches/network/src/lib/lang/base_object.cc

@@ -75 +75 @@
   this->classID |= (long)classID;
   this->className = className;
+  this->realClassID = classID;
 
   ClassList::addToClassList(this, classID, className);

branches/network/src/lib/lang/base_object.h

@@ -34 +34 @@
   /** @returns the classID of the corresponding Object */
   inline int getClassID() const { return this->classID; };
+  inline int getRealClassID() const { return this->realClassID; };
 
   bool isA (ClassID classID) const;
@@ -49 +50 @@
     const char*        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
+    long               realClassID;      //!< classID which can be used with factory
     char*              objectName;       //!< The name of this object
 };

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++;