Changeset 8327 for code/trunk/src/orxonox/gametypes/UnderAttack.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/UnderAttack.cc
r6417 r8327 76 76 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it) 77 77 { 78 if (it->first->getClientID() == CLIENTID_UNKNOWN)78 if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN) 79 79 continue; 80 80 … … 158 158 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it) 159 159 { 160 if (it->first->getClientID() == CLIENTID_UNKNOWN)160 if (it->first->getClientID() == NETWORK_PEER_ID_UNKNOWN) 161 161 continue; 162 162
Note: See TracChangeset
for help on using the changeset viewer.