Changeset 6868 in orxonox.OLD for trunk/src/lib/network/network_game_manager.cc

Timestamp:

Jan 30, 2006, 4:41:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Network back to the trunk.
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6817:HEAD
no conflicts

File:

• trunk/src/lib/network/network_game_manager.cc (modified) (1 diff)

trunk/src/lib/network/network_game_manager.cc

@@ -575 +575 @@
     if ( (*it)->getUniqueID() == uniqueID )
     {
-      delete *it;
+      assert((*it)->isA(CL_WORLD_ENTITY));
+      dynamic_cast<WorldEntity*>(*it)->toList(OM_DEAD);
       break;
     }