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

Timestamp:

Jul 17, 2009, 11:53:35 PM (15 years ago)

Author:

rgrieder

Message:

Found a few more C-Style casts.

Location:

code/trunk/src/orxonox/objects

Files:

• gametypes/TeamDeathmatch.cc (modified) (3 diffs)
• gametypes/UnderAttack.cc (modified) (1 diff)
• infos/Bot.cc (modified) (1 diff)
• pickup/PickupCollection.cc (modified) (1 diff)
• worldentities/ParticleEmitter.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (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 < (int)this->teams_ && it->second >= 0)
+            if (it->second < static_cast<int>(this->teams_) && it->second >= 0)
                 playersperteam[it->second]++;
 
@@ -127 +127 @@
             {
                 TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it);
-                if (tsp && (int)tsp->getTeamNumber() != desiredTeamNr)
+                if (tsp && static_cast<int>(tsp->getTeamNumber()) != desiredTeamNr)
                 {
                     teamSpawnPoints.erase(it++);
@@ -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 < (int)this->teamcolours_.size())
+        if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < static_cast<int>(this->teamcolours_.size()))
         {
             if (pawn)

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

@@ -51 +51 @@
 
         this->setConfigValues();
-        this->timesequence_ = (int) this->gameTime_;
+        this->timesequence_ = static_cast<this->gameTime_);
     }
 

code/trunk/src/orxonox/objects/infos/Bot.cc

@@ -52 +52 @@
         this->setConfigValues();
 
-        this->setName(this->names_[(size_t)(rnd() * this->names_.size())]);
+        this->setName(this->names_[static_cast<size_t>(rnd() * this->names_.size())]);
 
         if (this->getGametype())

code/trunk/src/orxonox/objects/pickup/PickupCollection.cc

@@ -86 +86 @@
     bool PickupCollection::checkSlot(BaseItem* item)
     {
-        return ((int)this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
+        return (static_cast<int>(this->items_.count(item->getPickupIdentifier())) < item->getMaxCarryAmount());
     }
     /**

code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h

@@ -64 +64 @@
         protected:
             inline void setLODxml(unsigned int level)
-                { this->LOD_ = (LODParticle::Value)level; this->LODchanged(); }
+                { this->LOD_ = static_cast<LODParticle::Value>(level); this->LODchanged(); }
             inline unsigned int getLODxml() const
                 { return (unsigned int)this->LOD_; }

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -281 +281 @@
         else
         {
-            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, ((uint8_t)firemode));
+            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, firemode);
             if (this->weaponSystem_)
                 this->weaponSystem_->fire(firemode);