Changeset 8327 for code/trunk/src/orxonox/gametypes/Gametype.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/Gametype.cc
r8079 r8327 263 263 it->second.frags_++; 264 264 265 if (killer->getPlayer()->getClientID() != CLIENTID_UNKNOWN)265 if (killer->getPlayer()->getClientID() != NETWORK_PEER_ID_UNKNOWN) 266 266 this->gtinfo_->sendKillMessage("You killed " + victim->getPlayer()->getName(), killer->getPlayer()->getClientID()); 267 if (victim->getPlayer()->getClientID() != CLIENTID_UNKNOWN)267 if (victim->getPlayer()->getClientID() != NETWORK_PEER_ID_UNKNOWN) 268 268 this->gtinfo_->sendDeathMessage("You were killed by " + killer->getPlayer()->getName(), victim->getPlayer()->getClientID()); 269 269 }
Note: See TracChangeset
for help on using the changeset viewer.