Index: code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc
===================================================================
--- code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc	(revision 3280)
+++ code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc	(revision 3300)
@@ -71,5 +71,5 @@
 
         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,5 +127,5 @@
             {
                 TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it);
-                if (tsp && (int)tsp->getTeamNumber() != desiredTeamNr)
+                if (tsp && static_cast<int>(tsp->getTeamNumber()) != desiredTeamNr)
                 {
                     teamSpawnPoints.erase(it++);
@@ -160,5 +160,5 @@
         // 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)
Index: code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc
===================================================================
--- code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc	(revision 3280)
+++ code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc	(revision 3300)
@@ -51,5 +51,5 @@
 
         this->setConfigValues();
-        this->timesequence_ = (int) this->gameTime_;
+        this->timesequence_ = static_cast<this->gameTime_);
     }
 
Index: code/trunk/src/orxonox/objects/infos/Bot.cc
===================================================================
--- code/trunk/src/orxonox/objects/infos/Bot.cc	(revision 3280)
+++ code/trunk/src/orxonox/objects/infos/Bot.cc	(revision 3300)
@@ -52,5 +52,5 @@
         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())
Index: code/trunk/src/orxonox/objects/pickup/PickupCollection.cc
===================================================================
--- code/trunk/src/orxonox/objects/pickup/PickupCollection.cc	(revision 3280)
+++ code/trunk/src/orxonox/objects/pickup/PickupCollection.cc	(revision 3300)
@@ -86,5 +86,5 @@
     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());
     }
     /**
Index: code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h
===================================================================
--- code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h	(revision 3280)
+++ code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h	(revision 3300)
@@ -64,5 +64,5 @@
         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_; }
Index: code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc	(revision 3280)
+++ code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc	(revision 3300)
@@ -281,5 +281,5 @@
         else
         {
-            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, ((uint8_t)firemode));
+            callMemberNetworkFunction(Pawn, doFire, this->getObjectID(), 0, firemode);
             if (this->weaponSystem_)
                 this->weaponSystem_->fire(firemode);
