Changeset 6673 in orxonox.OLD for branches

Timestamp:

Jan 24, 2006, 3:10:55 PM (19 years ago)

Author:

patrick

Message:

newtork: now only entities created on the server get a valiable uniqueID

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (2 diffs)
• network_manager.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)

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

@@ -211 +211 @@
 int NetworkGameManager::createEntity( ClassID classID, int owner )
 {
-  if ( this->isServer() )
+  if ( this->isServer())
   {
     if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
@@ -218 +218 @@
       return -1;
     }
-
     return this->executeCreateEntity( classID, NetworkManager::getInstance()->getNewUniqueID(), owner );
   }

branches/network/src/lib/network/network_manager.h

@@ -54 +54 @@
 
     /** @returns the next uniqueID free for an object */
-    inline int getNewUniqueID() { return this->newUniqueID++; }
+    inline int getNewUniqueID() { return ( this->bGameServer)?this->newUniqueID++:-1; }
 
     void debug();

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

@@ -439 +439 @@
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    //if( (*it)->beSynchronized() == true)
+    if( (*it)->beSynchronized() == true)
       PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(),
                (*it)->getUniqueID(), (*it)->beSynchronized());