Changeset 2906 for code/branches/gametypes
- Timestamp:
- Apr 7, 2009, 5:43:08 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.cc
r2903 r2906 71 71 72 72 for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it) 73 if (it->second < this->teams_ && it->second >= 0)73 if (it->second < (int)this->teams_ && it->second >= 0) 74 74 playersperteam[it->second]++; 75 75 … … 127 127 { 128 128 TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it); 129 if (tsp && tsp->getTeamNumber() != desiredTeamNr)129 if (tsp && (int)tsp->getTeamNumber() != desiredTeamNr) 130 130 { 131 131 teamSpawnPoints.erase(it++); … … 160 160 // Set the team colour 161 161 std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player); 162 if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < this->teamcolours_.size())162 if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < (int)this->teamcolours_.size()) 163 163 { 164 164 if (pawn)
Note: See TracChangeset
for help on using the changeset viewer.