Changeset 5929 for code/trunk/src/orxonox/PlayerManager.cc
- Timestamp:
- Oct 12, 2009, 8:20:07 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core5 (added) merged: 5768-5769,5772,5775-5780,5783-5785,5791-5792,5795-5807,5809-5814,5816-5832,5836-5839,5842-5853,5855-5899,5904-5922,5924-5928
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/PlayerManager.cc
r5781 r5929 31 31 #include "core/CoreIncludes.h" 32 32 #include "core/GameMode.h" 33 #include "core/ScopedSingletonManager.h" 33 34 #include "Level.h" 34 35 #include "infos/HumanPlayer.h" … … 38 39 { 39 40 PlayerManager* PlayerManager::singletonPtr_s = 0; 41 ManageScopedSingleton(PlayerManager, ScopeID::Root, false); 40 42 41 43 PlayerManager::PlayerManager() … … 74 76 if (GameMode::isMaster()) 75 77 { 76 COUT(3) << "client disconnected" << std::endl; 78 if (clientID != 0) 79 COUT(3) << "client disconnected" << std::endl; 77 80 78 81 // remove from clients-map … … 85 88 // delete PlayerInfo instance 86 89 if (player) 87 delete player;90 player->destroy(); 88 91 } 89 92 }
Note: See TracChangeset
for help on using the changeset viewer.