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

Timestamp:

Sep 18, 2006, 10:06:19 PM (18 years ago)

Author:

bensch

Message:

new_class_id: hups… this was bad naming… confusing too.

File:

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

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

@@ -967 +967 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && Handshake::classID() != sync.getLeafClassID())
+      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
         continue;
 
@@ -973 +973 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && Handshake::classID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
+             && Handshake::staticClassID() == 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 ( NullParent::classID() == sync.getLeafClassID())
+      if ( NullParent::staticClassID() == sync.getLeafClassID())
         continue;
 
@@ -1187 +1187 @@
           /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
           /* Exception 1: NullParent */
-          if( NullParent::classID() == leafClassId || Synchronizeable::classID() == leafClassId || NetworkGameManager::classID() == leafClassId)
+          if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
           {
             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
@@ -1203 +1203 @@
           }
 
-          if ( b->isA(Synchronizeable::classID()) )
+          if ( b->isA(Synchronizeable::staticClassID()) )
           {
             sync = dynamic_cast<Synchronizeable*>(b);