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

Timestamp:

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

Author:

bensch

Message:

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

Location:

branches/new_class_id/src/lib/network

Files:

• network_game_manager.cc (modified) (5 diffs)
• network_stream.cc (modified) (4 diffs)
• synchronizeable.cc (modified) (1 diff)

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

@@ -92 +92 @@
   assert( SharedNetworkData::getInstance()->isMasterServer());
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
+  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
@@ -105 +105 @@
 
   assert( bo != NULL );
-  assert( bo->isA( Playable::classID()) );
+  assert( bo->isA( Playable::staticClassID()) );
 
   Playable & playable = *(dynamic_cast<Playable*>(bo));
@@ -130 +130 @@
     stats->setNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Server" ) );
 
-  if ( rules.isA( MultiplayerTeamDeathmatch::classID()) )
+  if ( rules.isA( MultiplayerTeamDeathmatch::staticClassID()) )
     dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
 
@@ -192 +192 @@
     if ( (*it)->getUniqueID() == uniqueId )
     {
-      if ( (*it)->isA(Playable::classID()) )
+      if ( (*it)->isA(Playable::staticClassID()) )
       {
         getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
@@ -321 +321 @@
 
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
+  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));

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

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

@@ -75 +75 @@
     // remove the message manager only by the server
     if ( (SharedNetworkData::getInstance()->isMasterServer() )
-          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::classID() ) )
+          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::staticClassID() ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
   }