Changeset 6672 in orxonox.OLD for branches/network/src/lib/network/network_game_manager.cc

Timestamp:

Jan 24, 2006, 3:02:19 PM (18 years ago)

Author:

patrick

Message:

network: now every entity gets a network uniqueID

File:

• branches/network/src/lib/network/network_game_manager.cc (modified) (5 diffs)

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

@@ -53 +53 @@
   this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
 
-  newUniqueID = MAX_CONNECTIONS + 2;
-
   hasRequestedWorld = false;
   this->setSynchronized(true);
@@ -215 +213 @@
   if ( this->isServer() )
   {
-    if ( newUniqueID < 0 )
+    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
@@ -221 +219 @@
     }
 
-    return this->executeCreateEntity( classID, newUniqueID++, owner );
+    return this->executeCreateEntity( classID, NetworkManager::getInstance()->getNewUniqueID(), owner );
   }
   else
@@ -240 +238 @@
   if ( this->isServer() )
   {
-    if ( newUniqueID < 0 )
+    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
@@ -258 +256 @@
     {
       Synchronizeable * s = dynamic_cast<Synchronizeable*>(b);
-      s->setUniqueID( newUniqueID++ );
+      s->setUniqueID( NetworkManager::getInstance()->getNewUniqueID() );
       s->setOwner( 0 );
       // all entities created via this function are added automaticaly to the synchronizeable list