Changeset 2926 for code/trunk/src

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

Location:

code/trunk/src/orxonox

Files:

• objects/gametypes/TeamDeathmatch.cc (modified) (3 diffs)
• overlays/notifications/NotificationQueue.cc (modified) (2 diffs)
• overlays/notifications/NotificationQueue.h (modified) (1 diff)

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)

code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -54 +54 @@
     const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
     const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
+    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
 
     /**
@@ -273 +274 @@
         string->clear();
         bool first = true;
-        for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
+        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
         {
             if(!first)

code/trunk/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -166 +166 @@
             static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
             static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
-            static const float DEFAULT_FONT_SIZE = 0.025; //!< The default font size.
+            static const float DEFAULT_FONT_SIZE; //!< The default font size.
 
             static const std::string DEFAULT_FONT; //!< The default font.