Changeset 2926 for code/trunk/src/orxonox/objects

Timestamp:

Apr 19, 2009, 10:46:06 PM (16 years ago)

Author:

rgrieder

Message:

• Using class { static const float foo = 3.2; }; is non standard C++, only integral types are allowed to be defined this way. —> Exported symbol to the source file
• Removed two unsigned/signed comparison warnings

File:

• code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -71 +71 @@
 
         for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
-            if (it->second < this->teams_ && it->second >= 0)
+            if (it->second < (int)this->teams_ && it->second >= 0)
                 playersperteam[it->second]++;
 
@@ -122 +122 @@
         // Only use spawnpoints of the own team (or non-team-spawnpoints)
         std::set<SpawnPoint*> teamSpawnPoints = this->spawnpoints_;
-        for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
+        for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
         {
             if ((*it)->isA(Class(TeamSpawnPoint)))
@@ -160 +160 @@
         // Set the team colour
         std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
-        if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < this->teamcolours_.size())
+        if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < (int)this->teamcolours_.size())
         {
             if (pawn)