Changeset 9691 in orxonox.OLD for branches/new_class_id/src/lib/network/network_stream.cc

Timestamp:

Aug 22, 2006, 11:45:21 PM (18 years ago)

Author:

bensch

Message:

new_class_id: adapted Network

File:

• branches/new_class_id/src/lib/network/network_stream.cc (modified) (7 diffs)

branches/new_class_id/src/lib/network/network_stream.cc

@@ -45 +45 @@
 
 #include "debug.h"
-#include "class_list.h"
-#include <algorithm>
-
 
 #include "network_stream.h"
@@ -118 +115 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
+  this->registerObject(this, NetworkStream::_objectList);
   this->clientSocket = NULL;
   this->clientSoftSocket = NULL;
@@ -970 +967 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && sync.getLeafClassID() != CL_HANDSHAKE )
+      if ( peer->second.handshake && Handshake::classID() != sync.getLeafClassID())
         continue;
 
@@ -976 +973 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+             && Handshake::classID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
         continue;
 
       /* list of synchronizeables that will never be synchronized over the network: */
       // do not sync null parent
-      if ( sync.getLeafClassID() == CL_NULL_PARENT )
+      if ( NullParent::classID() == sync.getLeafClassID())
         continue;
 
@@ -1190 +1187 @@
           /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
           /* Exception 1: NullParent */
-          if( leafClassId == CL_NULL_PARENT || leafClassId == CL_SYNCHRONIZEABLE || leafClassId == CL_NETWORK_GAME_MANAGER )
+          if( NullParent::classID() == leafClassId || Synchronizeable::classID() == leafClassId || NetworkGameManager::classID() == leafClassId)
           {
             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
@@ -1197 +1194 @@
           }
           else
-            b = Factory::fabricate( (ClassID)leafClassId );
+            b = Factory::fabricate( leafClassId );
 
           if ( !b )
@@ -1206 +1203 @@
           }
 
-          if ( b->isA(CL_SYNCHRONIZEABLE) )
+          if ( b->isA(Synchronizeable::classID()) )
           {
             sync = dynamic_cast<Synchronizeable*>(b);