Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2926


Ignore:
Timestamp:
Apr 19, 2009, 10:46:06 PM (15 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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

    r2904 r2926  
    7171
    7272        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)
    7474                playersperteam[it->second]++;
    7575
     
    122122        // Only use spawnpoints of the own team (or non-team-spawnpoints)
    123123        std::set<SpawnPoint*> teamSpawnPoints = this->spawnpoints_;
    124         for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
     124        for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
    125125        {
    126126            if ((*it)->isA(Class(TeamSpawnPoint)))
     
    160160        // Set the team colour
    161161        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())
    163163        {
    164164            if (pawn)
  • code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc

    r2911 r2926  
    5454    const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
    5555    const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
     56    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
    5657
    5758    /**
     
    273274        string->clear();
    274275        bool first = true;
    275         for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
     276        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
    276277        {
    277278            if(!first)
  • code/trunk/src/orxonox/overlays/notifications/NotificationQueue.h

    r2911 r2926  
    166166            static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
    167167            static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
    168             static const float DEFAULT_FONT_SIZE = 0.025; //!< The default font size.
     168            static const float DEFAULT_FONT_SIZE; //!< The default font size.
    169169
    170170            static const std::string DEFAULT_FONT; //!< The default font.
Note: See TracChangeset for help on using the changeset viewer.