Changeset 8327 for code/trunk/src/orxonox/gametypes/LastManStanding.cc
- Timestamp:
- Apr 25, 2011, 8:22:36 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/network6 (added) merged: 7823-7825,7875,7878,7881-7882,7898,7900,7931,8315
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gametypes/LastManStanding.cc
r8234 r8327 86 86 if (it != this->players_.end()) 87 87 { 88 if (it->first->getClientID()== CLIENTID_UNKNOWN)88 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN) 89 89 return true; 90 90 const std::string& message = ""; // resets Camper-Warning-message … … 131 131 for (std::map<PlayerInfo*, int>::iterator it = this->playerLives_.begin(); it != this->playerLives_.end(); ++it) 132 132 { 133 if (it->first->getClientID() == CLIENTID_UNKNOWN)133 if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN) 134 134 continue; 135 135 … … 194 194 if (it != this->players_.end()) 195 195 { 196 if (it->first->getClientID()== CLIENTID_UNKNOWN)196 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN) 197 197 return; 198 198 const std::string& message = ""; // resets Camper-Warning-message … … 249 249 this->inGame_[it->first]=true; 250 250 251 if (it->first->getClientID()== CLIENTID_UNKNOWN)251 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN) 252 252 continue; 253 253 int output=1+(int)playerDelayTime_[it->first]; … … 261 261 { 262 262 this->punishPlayer(it->first); 263 if (it->first->getClientID()== CLIENTID_UNKNOWN)263 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN) 264 264 return; 265 265 const std::string& message = ""; // resets Camper-Warning-message … … 269 269 else if (it->second<timeRemaining/5)//Warning message 270 270 { 271 if (it->first->getClientID()== CLIENTID_UNKNOWN)271 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN) 272 272 continue; 273 273 const std::string& message = "Camper Warning! Don't forget to shoot.";
Note: See TracChangeset
for help on using the changeset viewer.