Changeset 11083 for code

Timestamp:

Jan 21, 2016, 1:59:04 PM (9 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

Location:

code/trunk/src

Files:

• libraries/core/GUIManager.cc (modified) (1 diff)
• libraries/core/class/SubclassIdentifier.h (modified) (3 diffs)
• libraries/core/input/KeyBinder.cc (modified) (1 diff)
• libraries/network/MasterServer.cc (modified) (3 diffs)
• libraries/network/packet/Gamestate.cc (modified) (1 diff)
• libraries/network/packet/ServerInformation.cc (modified) (3 diffs)
• libraries/util/Serialise.h (modified) (26 diffs)
• modules/gametypes/SpaceRaceController.cc (modified) (1 diff)
• modules/hover/TimeHUD.cc (modified) (1 diff)
• modules/invader/Invader.cc (modified) (1 diff)
• modules/invader/InvaderEnemy.cc (modified) (1 diff)
• modules/invader/InvaderEnemy.h (modified) (1 diff)
• modules/invader/InvaderEnemyShooter.cc (modified) (1 diff)
• modules/objects/ForceField.cc (modified) (2 diffs)
• modules/objects/ForceField.h (modified) (2 diffs)
• modules/objects/SpaceBoundaries.cc (modified) (1 diff)
• modules/objects/triggers/DistanceTrigger.h (modified) (1 diff)
• modules/objects/triggers/EventTrigger.h (modified) (1 diff)
• modules/overlays/hud/ChatOverlay.cc (modified) (1 diff)
• modules/pickup/items/ShrinkPickup.cc (modified) (1 diff)
• modules/pong/Pong.cc (modified) (2 diffs)
• modules/questsystem/QuestListener.cc (modified) (1 diff)
• modules/questsystem/effects/ChangeQuestStatus.h (modified) (1 diff)
• modules/tetris/Tetris.cc (modified) (2 diffs)
• modules/tetris/TetrisBrick.cc (modified) (1 diff)
• modules/tetris/TetrisStone.cc (modified) (1 diff)
• modules/towerdefense/TDCoordinate.cc (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (3 diffs)
• modules/weapons/projectiles/GravityBombField.cc (modified) (2 diffs)
• orxonox/chat/ChatInputHandler.cc (modified) (1 diff)
• orxonox/controllers/ActionpointController.cc (modified) (32 diffs)
• orxonox/controllers/DivisionController.cc (modified) (1 diff)
• orxonox/controllers/FightingController.cc (modified) (5 diffs)
• orxonox/controllers/ScriptController.cc (modified) (2 diffs)
• orxonox/controllers/SectionController.cc (modified) (5 diffs)
• orxonox/controllers/WingmanController.cc (modified) (3 diffs)
• orxonox/gametypes/LastManStanding.cc (modified) (4 diffs)
• orxonox/gametypes/LastTeamStanding.cc (modified) (4 diffs)
• orxonox/graphics/LensFlare.cc (modified) (1 diff)
• orxonox/graphics/LensFlare.h (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (1 diff)
• orxonox/worldentities/StaticEntity.cc (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (1 diff)
• orxonox/worldentities/pawns/FpsPlayer.h (modified) (4 diffs)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (3 diffs)

code/trunk/src/libraries/core/GUIManager.cc

@@ -104 +104 @@
 #include "util/OrxAssert.h"
 #include "util/output/BaseWriter.h"
+#include "util/StringUtils.h"
+#include "util/SubString.h"
 #include "config/ConfigValueIncludes.h"
 #include "Core.h"

code/trunk/src/libraries/core/class/SubclassIdentifier.h

@@ -92 +92 @@
         public:
             /// Constructor: Automaticaly assigns the Identifier of the given class.
-            SubclassIdentifier()
+            SubclassIdentifier() : identifier_(nullptr)
             {
                 this->identifier_ = ClassIdentifier<T>::getIdentifier();
@@ -98 +98 @@
 
             /// Constructor: Assigns the given Identifier.
-            SubclassIdentifier(Identifier* identifier)
+            SubclassIdentifier(Identifier* identifier) : identifier_(nullptr)
             {
                 this->operator=(identifier);
@@ -105 +105 @@
             /// Copyconstructor: Assigns the identifier of another SubclassIdentifier.
             template <class O>
-            SubclassIdentifier(const SubclassIdentifier<O>& identifier)
+            SubclassIdentifier(const SubclassIdentifier<O>& identifier) : identifier_(nullptr)
             {
                 this->operator=(identifier.getIdentifier());

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -67 +67 @@
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
         {
-            const std::string& keyname = KeyCode::ByString[i];
+            const std::string keyname = KeyCode::ByString[i];
             if (!keyname.empty())
                 keys_[i].name_ = std::string("Key") + keyname;

code/trunk/src/libraries/network/MasterServer.cc

@@ -253 +253 @@
     /* convert to string */
     std::string ip = std::string( addrconv );
+    /* output debug info about the data that has come */
+    helper_output_debug(event, addrconv);
     /* delete addrconv */
     if( addrconv ) free( addrconv );
@@ -259 +261 @@
     char * packetdata = (char *)event->packet->data;
 
-    /* output debug info about the data that has come */
-    helper_output_debug( event, addrconv );
 
     /* GAME SERVER OR CLIENT CONNECTION? */
@@ -332 +332 @@
   {
     /***** ENTER MAIN LOOP *****/
-    ENetEvent *event = (ENetEvent *)calloc(sizeof(ENetEvent), sizeof(char));
+    ENetEvent *event = (ENetEvent *)calloc(1, sizeof(ENetEvent));
     if( event == nullptr )
     {

code/trunk/src/libraries/network/packet/Gamestate.cc

@@ -489 +489 @@
 Gamestate* Gamestate::diffVariables(Gamestate *base)
 {
-  assert(this && base); assert(data_ && base->data_);
+  assert(base); assert(data_ && base->data_);
   assert(!header_.isCompressed() && !base->header_.isCompressed());
   assert(!header_.isDiffed());

code/trunk/src/libraries/network/packet/ServerInformation.cc

@@ -55 +55 @@
       // Save ACK
       uint8_t* temp = event->packet->data;
-      char* ack = new char[strlen(LAN_DISCOVERY_ACK)+1];
+      char* ack = nullptr;
       loadAndIncrease((char*&)ack, temp);
 
@@ -64 +64 @@
       // Save Server Name
       loadAndIncrease(this->serverName_, temp);
+      delete[] ack;
     }
 
@@ -74 +75 @@
     {
       std::string payload = this->serverName_ + Ogre::StringConverter::toString(this->clientNumber_);
-      uint32_t size = returnSize((char*&)LAN_DISCOVERY_ACK) + returnSize(payload);
+      uint32_t size = returnSize(LAN_DISCOVERY_ACK) + returnSize(payload);
       uint8_t* temp = new uint8_t[size];
       uint8_t* temp2 = temp;
-      saveAndIncrease((char*&)LAN_DISCOVERY_ACK, temp2);
+      saveAndIncrease(LAN_DISCOVERY_ACK, temp2);
       saveAndIncrease(payload, temp2);
       ENetPacket* packet = enet_packet_create( temp, size, 0 );

code/trunk/src/libraries/util/Serialise.h

@@ -48 +48 @@
     template <class T> inline uint32_t returnSize( const T& variable );
     /** @brief loads the value of a variable out of the bytestream and increases the mem pointer */
-    template <class T> inline void loadAndIncrease( const T& variable, uint8_t*& mem );
+    template <class T> inline void loadAndIncrease( T& variable, uint8_t*& mem );
     /** @brief saves the value of a variable into the bytestream and increases the mem pointer */
     template <class T> inline void saveAndIncrease( const T& variable, uint8_t*& mem );
@@ -57 +57 @@
   // =========== char*
 
-  inline uint32_t returnSize( char*& variable )
+  inline uint32_t returnSize(const char*& variable )
   {
     return strlen(variable)+1;
   }
 
-  inline void saveAndIncrease( char*& variable, uint8_t*& mem )
+  inline void saveAndIncrease(const char*& variable, uint8_t*& mem )
   {
-    strcpy((char*)mem, variable);
-    mem += returnSize(variable);
+    uint32_t len = returnSize(variable);
+    std::memcpy(mem, variable, len);
+    mem += len;
   }
 
@@ -72 +73 @@
     if( variable )
       delete variable;
-    uint32_t len = strlen((char*)mem)+1;
+    uint32_t len = returnSize((const char*&)mem);
     variable = new char[len];
-    strcpy((char*)variable, (char*)mem);
+    std::memcpy(variable, mem, len);
     mem += len;
   }
@@ -92 +93 @@
     }
 
-    template <> inline void loadAndIncrease( const bool& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( bool& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -116 +117 @@
     }
 
-    template <> inline void loadAndIncrease( const char& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( char& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -140 +141 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned char& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned char& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -164 +165 @@
     }
 
-    template <> inline void loadAndIncrease( const short& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( short& variable, uint8_t*& mem )
     {
         *(short*)( &variable ) = *(int16_t*)(mem);
@@ -188 +189 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned short& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned short& variable, uint8_t*& mem )
     {
         *(unsigned short*)( &variable ) = *(uint16_t*)(mem);
@@ -212 +213 @@
     }
 
-    template <> inline void loadAndIncrease( const int& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( int& variable, uint8_t*& mem )
     {
         *(int *)( &variable ) = *(int32_t*)(mem);
@@ -236 +237 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned int& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned int& variable, uint8_t*& mem )
     {
         *(unsigned int*)( &variable ) = *(uint32_t*)(mem);
@@ -260 +261 @@
     }
 
-    template <> inline void loadAndIncrease( const long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long& variable, uint8_t*& mem )
     {
         *(long*)( &variable ) = *(int32_t*)(mem);
@@ -284 +285 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned long& variable, uint8_t*& mem )
     {
         *(unsigned long*)( &variable ) = *(uint32_t*)(mem);
@@ -308 +309 @@
     }
 
-    template <> inline void loadAndIncrease( const long long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long long& variable, uint8_t*& mem )
     {
         *(long long*)( &variable ) = *(int64_t*)(mem);
@@ -332 +333 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned long long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned long long& variable, uint8_t*& mem )
     {
         *(unsigned long long*)( &variable ) = *(uint64_t*)(mem);
@@ -356 +357 @@
     }
 
-    template <> inline void loadAndIncrease( const float& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( float& variable, uint8_t*& mem )
     {
         *(uint32_t*)( &variable ) = *(uint32_t*)(mem);
@@ -380 +381 @@
     }
 
-    template <> inline void loadAndIncrease( const double& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( double& variable, uint8_t*& mem )
     {
         *(uint64_t*)( &variable ) = *(uint64_t*)(mem);
@@ -404 +405 @@
     }
 
-    template <> inline void loadAndIncrease( const long double& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long double& variable, uint8_t*& mem )
     {
         double temp;
@@ -438 +439 @@
     }
 
-    template <> inline void loadAndIncrease( const std::string& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( std::string& variable, uint8_t*& mem )
     {
         *(std::string*)( &variable ) = (const char *)mem;
@@ -464 +465 @@
     }
 
-    template <> inline void loadAndIncrease( const Degree& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Degree& variable, uint8_t*& mem )
     {
         Ogre::Real* r = (Ogre::Real*)mem;
@@ -491 +492 @@
     }
 
-    template <> inline void loadAndIncrease( const Radian& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Radian& variable, uint8_t*& mem )
     {
         Ogre::Real* r = (Ogre::Real*)mem;
@@ -517 +518 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector2& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector2& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.x, mem );
@@ -542 +543 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector3& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector3& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.x, mem );
@@ -570 +571 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector4& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector4& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.w, mem );
@@ -600 +601 @@
     }
 
-    template <> inline void loadAndIncrease( const Quaternion& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Quaternion& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.w, mem );
@@ -630 +631 @@
     }
 
-    template <> inline void loadAndIncrease( const ColourValue& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( ColourValue& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.r, mem );
@@ -657 +658 @@
     }
 
-    template <> inline void loadAndIncrease( const mbool& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( mbool& variable, uint8_t*& mem )
     {
         loadAndIncrease( (unsigned char&)((mbool&)variable).getMemory(), mem );

code/trunk/src/modules/gametypes/SpaceRaceController.cc

@@ -397 +397 @@
     bool SpaceRaceController::vergleicheQuader(const Vector3& pointToPoint, const Vector3& groesse)
     {
-        if(abs(pointToPoint.x) < groesse.x)
+        if(std::abs(pointToPoint.x) < groesse.x)
             return true;
-        if(abs(pointToPoint.y) < groesse.y)
+        if(std::abs(pointToPoint.y) < groesse.y)
             return true;
-        if(abs(pointToPoint.z) < groesse.z)
+        if(std::abs(pointToPoint.z) < groesse.z)
             return true;
         return false;

code/trunk/src/modules/hover/TimeHUD.cc

@@ -82 +82 @@
         {
             this->setCaption(getTimeString(this->time_));
+            if (this->hoverGame_->getNumberOfFlags() == 0)
+                setRunning(false);
         }
-        if(this->hoverGame_->getNumberOfFlags() == 0)
-            setRunning(false);
         
     }

code/trunk/src/modules/invader/Invader.cc

@@ -129 +129 @@
                 newPawn->addTemplate("enemyinvader");
             }
-            newPawn->setPlayer(player);
+            newPawn->setInvaderPlayer(player);
             newPawn->level = level;
             // spawn enemy at random points in front of player.

code/trunk/src/modules/invader/InvaderEnemy.cc

@@ -58 +58 @@
         if (player != nullptr)
         {
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
+            float newZ = 2/(pow(std::abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
             setVelocity(Vector3(1000.f - level * 100 , 0, newZ));
         }

code/trunk/src/modules/invader/InvaderEnemy.h

@@ -49 +49 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
-            virtual void setPlayer(InvaderShip* player){this->player = player;}
+            virtual void setInvaderPlayer(InvaderShip* player){this->player = player;}
 
             int level;

code/trunk/src/modules/invader/InvaderEnemyShooter.cc

@@ -63 +63 @@
             float distPlayer = player->getPosition().z - getPosition().z;
             // orxout() << "i'm different!" << endl;
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * distPlayer;
-            setVelocity(Vector3(950 - abs(distPlayer), 0, newZ));
+            float newZ = 2/(pow(std::abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * distPlayer;
+            setVelocity(Vector3(950 - std::abs(distPlayer), 0, newZ));
         }
         Pawn::tick(dt);

code/trunk/src/modules/objects/ForceField.cc

@@ -63 +63 @@
         //Standard Values
         this->setDirection(Vector3::ZERO);
-        this->setVelocity(100);
+        this->setFieldVelocity(100);
         this->setDiameter(500);
         this->setMassDiameter(0);   //! We allow point-masses
@@ -88 +88 @@
         SUPER(ForceField, XMLPort, xmlelement, mode);
 
-        XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
+        XMLPortParam(ForceField, "velocity", setFieldVelocity, getFieldVelocity, xmlelement, mode).defaultValues(100);
         XMLPortParam(ForceField, "diameter", setDiameter, getDiameter, xmlelement, mode).defaultValues(500);
         XMLPortParam(ForceField, "massDiameter", setMassDiameter, getMassDiameter, xmlelement, mode).defaultValues(0);

code/trunk/src/modules/objects/ForceField.h

@@ -98 +98 @@
             @param vel The velocity to be set.
             */
-            inline void setVelocity(float vel)
+            inline void setFieldVelocity(float vel)
                 { this->velocity_ = vel; }
             /**
@@ -104 +104 @@
             @return Returns the velocity of the ForceField.
             */
-            inline float getVelocity()
+            inline float getFieldVelocity()
                 { return this->velocity_; }
 

code/trunk/src/modules/objects/SpaceBoundaries.cc

@@ -221 +221 @@
                     }
                 }
-                if(/* humanItem &&*/ abs(this->maxDistance_ - distance) < this->showDistance_ )
+                if(/* humanItem &&*/ std::abs(this->maxDistance_ - distance) < this->showDistance_ )
                 {
                     this->displayBoundaries(currentPawn, 1.0f - fabs(this->maxDistance_ - distance) / this->showDistance_); // Show the boundary

code/trunk/src/modules/objects/triggers/DistanceTrigger.h

@@ -97 +97 @@
             virtual ~DistanceTrigger();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); // Method for creating a DistanceTrigger object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; // Method for creating a DistanceTrigger object through XML.
 
             void addTarget(const std::string& targets); // Add some target to the DistanceTrigger.

code/trunk/src/modules/objects/triggers/EventTrigger.h

@@ -73 +73 @@
             virtual ~EventTrigger();
 
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); // Creates an event port.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; // Creates an event port.
 
             /**

code/trunk/src/modules/overlays/hud/ChatOverlay.cc

@@ -73 +73 @@
         Timer* timer = new Timer();
         this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
-        const ExecutorPtr& executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
+        const ExecutorPtr executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
         executor->setDefaultValues(timer);
         timer->setTimer(this->displayTime_, false, executor, true);

code/trunk/src/modules/pickup/items/ShrinkPickup.cc

@@ -277 +277 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if (pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                {
                     this->Pickupable::destroy();
+                    return;
+                }
 
                 this->timeRemainig_ -= dt;

code/trunk/src/modules/pong/Pong.cc

@@ -326 +326 @@
     PlayerInfo* Pong::getLeftPlayer() const
     {
-        if (this->bat_ != nullptr && this->bat_[0] != nullptr)
+        if (this->bat_[0] != nullptr)
             return this->bat_[0]->getPlayer();
         else
@@ -340 +340 @@
     PlayerInfo* Pong::getRightPlayer() const
     {
-        if (this->bat_ != nullptr && this->bat_[1] != nullptr)
+        if (this->bat_[1] != nullptr)
             return this->bat_[1]->getPlayer();
         else

code/trunk/src/modules/questsystem/QuestListener.cc

@@ -81 +81 @@
         XMLPortParam(QuestListener, "mode", setMode, getMode, xmlelement, mode);
 
-        if(this->quest_ != nullptr)
+        std::string questid;
+
+        if (this->quest_ != nullptr)
+        {
             this->quest_->addListener(this); // Adds the QuestListener to the Quests list of listeners.
-
-        orxout(verbose, context::quests) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << endl;
+            questid = this->quest_->getId();
+        }
+
+        orxout(verbose, context::quests) << "QuestListener created for quest: {" << questid << "} with mode '" << this->getMode() << "'." << endl;
     }
 

code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h

@@ -61 +61 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a ChangeQuestStatus object through XML.
 
-            virtual bool invoke(PlayerInfo* player) = 0; //!< Invokes the QuestEffect.
-
         protected:
             /**

code/trunk/src/modules/tetris/Tetris.cc

@@ -140 +140 @@
             const Vector3& currentStonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
 
-            if((position.x == currentStonePosition.x) && abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
+            if((position.x == currentStonePosition.x) && std::abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
                 return false;
         }
@@ -222 +222 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-            float baseOffset = abs(stone->getPosition().y);
+            float baseOffset = std::abs(stone->getPosition().y);
             if (this->activeBrick_->getRotationCount() == 1 || this->activeBrick_->getRotationCount() == 3)
-                baseOffset = abs(stone->getPosition().x);
+                baseOffset = std::abs(stone->getPosition().x);
             float yOffset = baseOffset + this->center_->getStoneSize()/2.0f;//calculate offset
             if(yOffset < 0) //catch brake-throughs

code/trunk/src/modules/tetris/TetrisBrick.cc

@@ -213 +213 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->isValidMove(newPos))
                 return;

code/trunk/src/modules/tetris/TetrisStone.cc

@@ -92 +92 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->tetris_->isValidMove(this, newPos))
                 return;

code/trunk/src/modules/towerdefense/TDCoordinate.cc

@@ -66 +66 @@
         float tileScale = 100;
 
-        Vector3 *coord = new Vector3();
-        coord->x= (_x-8) * tileScale;
-        coord->y= (_y-8) * tileScale;
-        coord->z=0;
+        Vector3 coord;
+        coord.x= (_x-8) * tileScale;
+        coord.y= (_y-8) * tileScale;
+        coord.z=0;
 
-        return *coord;
+        return coord;
     }
 }

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -377 +377 @@
     {        
         TowerDefenseField* thisField = fields_[thisCoord->GetX()][thisCoord->GetY()];
-        TDCoordinate* nextCoord = new TDCoordinate(0,0);
 
         if (thisField->getType() != TowerDefenseFieldType::STREET && thisField->getType() != TowerDefenseFieldType::START)
@@ -384 +383 @@
         }
 
+        TDCoordinate* nextCoord = new TDCoordinate(0, 0);
+
         if (thisField->getAngle() == 0)
         {
@@ -406 +407 @@
         }
 
+        delete nextCoord;
         return nullptr;
     }

code/trunk/src/modules/weapons/projectiles/GravityBombField.cc

@@ -34 +34 @@
         fieldExploded_ = false;
 
-        setVelocity(FORCE_SPHERE_START_STRENGTH);
+        setFieldVelocity(FORCE_SPHERE_START_STRENGTH);
         setDiameter(2*FORCE_SPHERE_START_RADIUS);
         setMode(modeSphere_s);
@@ -158 +158 @@
         
         setDiameter(forceSphereRadius_*2);
-        setVelocity(forceStrength_);
+        setFieldVelocity(forceStrength_);
         if(lifetime_>0) particleSphere_->setScale(forceSphereRadius_/FORCE_SPHERE_START_RADIUS);
         bombModel_->setScale(modelScaling_);

code/trunk/src/orxonox/chat/ChatInputHandler.cc

@@ -214 +214 @@
   {
     /* sanity checks */
-    if( !tocolor )
-      orxout(internal_warning) << "Empty ListBoxTextItem given to "
-        "ChatInputhandler::sub_setcolor()." << endl;
+    if (!tocolor)
+    {
+        orxout(internal_warning) << "Empty ListBoxTextItem given to "
+            "ChatInputhandler::sub_setcolor()." << endl;
+        return;
+    }
 
     /* "hash" the name */

code/trunk/src/orxonox/controllers/ActionpointController.cc

@@ -74 +74 @@
     void ActionpointController::tick(float dt)
     {
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
 
@@ -86 +86 @@
         }
 
-        if (!this || !this->getControllableEntity())
-            return;
         //fly
         if (this->bHasTargetPosition_)
@@ -98 +96 @@
         }
         
-
-        if (!this || !this->getControllableEntity())
-            return;
         //don't fire rocket each tick
         if (timeout_ <= 0)
@@ -111 +106 @@
         }
 
-        if (!this || !this->getControllableEntity())
-            return;
         //sometimes dodge, sometimes attack
         if (this->ticks_ % 80 <= 10)
@@ -123 +116 @@
         }
 
-        if (!this || !this->getControllableEntity())
-            return;
         //fire if you can
         if (this->bShooting_)
@@ -140 +131 @@
     void ActionpointController::action()
     {
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
 
@@ -152 +143 @@
             this->startAttackingEnemiesThatAreClose();
         }
-        if (!this || !this->getControllableEntity())
-            return;
 
         //No action -> pop one from stack
@@ -161 +150 @@
             if (this->parsedActionpoints_.empty() && this->loopActionpoints_.empty() && this->bDefaultFightAll_)
             {
-                if (!this || !this->getControllableEntity())
-                    return;
                 Point p = { Action::FIGHTALL, "", Vector3::ZERO, false };
                 this->parsedActionpoints_.push_back (p);
             }
-            if (!this || !this->getControllableEntity())
-                return;
             this->executeActionpoint();
-            if (!this || !this->getControllableEntity())
-                return;
             this->bTakenOver_ = false;
         }
-        if (!this || !this->getControllableEntity())
-            return;
 
         //Action fightall -> fight till nobody alive
@@ -185 +166 @@
                 if (newTarget)
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->setAction (Action::FIGHTALL, newTarget);
                 }
                 else
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->nextActionpoint();
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->executeActionpoint();
     
@@ -207 +182 @@
             {
                 //----find a target----
-                ControllableEntity* newTarget = this->closestTarget();  
-                if (!this || !this->getControllableEntity())
-                    return;  
+                ControllableEntity* newTarget = this->closestTarget();
                 if (newTarget && 
                         CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->setAction (Action::FIGHT, newTarget);
                 }
                 else
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->nextActionpoint();
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->executeActionpoint();
                 }
@@ -235 +202 @@
                 {
                     ControllableEntity* newTarget = this->closestTarget();
-                    if (!this || !this->getControllableEntity())
-                        return;
                     if (newTarget && 
                         CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
                     {
-                        if (!this || !this->getControllableEntity())
-                            return;
                         this->setAction (Action::FIGHT, newTarget);
                     }
                     else
                     {
-                        if (!this || !this->getControllableEntity())
-                            return;
                         this->nextActionpoint();
-                        if (!this || !this->getControllableEntity())
-                            return;
                         this->executeActionpoint();
                     }
@@ -260 +219 @@
             if (this->squaredDistanceToTarget() <= this->squaredaccuracy_)
             {
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->nextActionpoint();   
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->executeActionpoint();
             }
@@ -272 +227 @@
             if (!this->getProtect())
             {
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->nextActionpoint();
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->executeActionpoint(); 
             }
-            if (!this || !this->getControllableEntity())
-                return;
             this->stayNearProtect();
         }
         else if (this->action_ == Action::ATTACK)
         {   
-            if (!this || !this->getControllableEntity())
-                return;
             if (!this->hasTarget())
             {
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->nextActionpoint();
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->executeActionpoint();
             }
@@ -408 +351 @@
     void ActionpointController::setAction (Action action, ControllableEntity* target)
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         this->action_ = action;
@@ -425 +368 @@
     void ActionpointController::setAction (Action action, const Vector3& target)
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         this->action_ = action;
@@ -436 +379 @@
     void ActionpointController::setAction (Action action, const Vector3& target,  const Quaternion& orient )
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         this->action_ = action;
@@ -454 +397 @@
     void ActionpointController::executeActionpoint()
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
 
@@ -473 +416 @@
         else
         {
-            if (!this || !this->getControllableEntity())
-                return;
-
             this->setTarget(nullptr);
             this->setTargetPosition(this->getControllableEntity()->getWorldPosition());
@@ -481 +421 @@
             return;
         }
-        if (!this || !this->getControllableEntity())
-            return;
         if (!this->bLoop_ && this->parsedActionpoints_.back().inLoop)
         {
             //MOVES all points that are in loop to a loop vector
             this->fillLoop();
-            if (!this || !this->getControllableEntity())
-                return;
             this->bLoop_ = true;
             executeActionpoint();
             return;
         }
-        if (!this || !this->getControllableEntity())
-            return;
         this->setAction (p.action);
-        if (!this || !this->getControllableEntity())
-            return;
 
         switch (this->action_)
@@ -508 +440 @@
                 for (Pawn* pawn : ObjectList<Pawn>())
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     if (CommonController::getName(pawn) == targetName)
                     {
@@ -520 +450 @@
             {
                 this->setTargetPosition( p.position );
-                if (!this || !this->getControllableEntity())
-                    return;
                 if (this->squaredDistanceToTarget() <= this->squaredaccuracy_)
                 {
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->nextActionpoint();
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->executeActionpoint();
                 }
@@ -535 +459 @@
             case Action::PROTECT:
             {
-                if (!this || !this->getControllableEntity())
-                    return;
 
                 std::string protectName = p.name;
@@ -582 +504 @@
                     if (CommonController::getName(pawn) == targetName)
                     {
-                        if (!this || !this->getControllableEntity())
-                            return;
                         this->setTarget (static_cast<ControllableEntity*>(pawn));
                     }
@@ -590 +510 @@
                 {
                     this->nextActionpoint();
-                    if (!this || !this->getControllableEntity())
-                        return;
                     this->executeActionpoint();
                 }
@@ -604 +522 @@
     void ActionpointController::stayNearProtect()
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
 
@@ -626 +544 @@
     void ActionpointController::nextActionpoint()
     {
-        if (!this || !this->getControllableEntity())
-            return;
         if (this->bLoop_)
         {
@@ -653 +569 @@
     void ActionpointController::moveBackToTop()
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
 
@@ -684 +600 @@
     void ActionpointController::takeActionpoints (const std::vector<Point>& vector, const std::vector<Point>& loop, bool b)
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         this->parsedActionpoints_ = vector;
-        if (!this || !this->getControllableEntity())
-            return;
         this->loopActionpoints_ = loop;
         this->bLoop_ = b;
@@ -701 +615 @@
     Pawn* ActionpointController::closestTarget()
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return nullptr;
 
@@ -709 +623 @@
         for (Pawn* pawn : ObjectList<Pawn>())
         {
-            if (!this || !this->getControllableEntity())
-                return nullptr;
             if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(pawn), gt) )
                 continue;
@@ -730 +642 @@
     void ActionpointController::startAttackingEnemiesThatAreClose()
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         
         if (!this->target_ || (this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_))
         {
-            if (!this || !this->getControllableEntity())
-                return;
             Pawn* newTarget = this->closestTarget();
             if ( newTarget && 
@@ -742 +652 @@
                     <= this->attackRange_ )
             {
-                if (!this || !this->getControllableEntity())
-                    return;
                 this->setTarget(newTarget);
                 if (this->bLoop_ && !this->bPatrolling_)

code/trunk/src/orxonox/controllers/DivisionController.cc

@@ -57 +57 @@
     void DivisionController::action()
     {   
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
         
         ActionpointController::action();
-        if (!this || !this->getControllableEntity())
-            return;
         if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
         {

code/trunk/src/orxonox/controllers/FightingController.cc

@@ -58 +58 @@
     void FightingController::lookAtTarget(float dt)
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         ControllableEntity* entity = this->getControllableEntity();
@@ -124 +124 @@
         Vector3 diffUnit = diffVector/diffLength;
 
-        if (!this || !this->getControllableEntity())
-            return;
-
         //too far? well, come closer then
         if (diffLength > this->attackRange_)
@@ -142 +139 @@
             this->bKeepFormation_ = false;
 
-            if (!this || !this->getControllableEntity())
-                return;
             if (!this->bDodge_)
             {
@@ -217 +212 @@
     float FightingController::squaredDistanceToTarget()  const
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return 0;
         if (!this->target_ || !this->getControllableEntity())
@@ -237 +232 @@
     Pawn* FightingController::closestTarget() const
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return nullptr;
 

code/trunk/src/orxonox/controllers/ScriptController.cc

@@ -227 +227 @@
           { 
             // Specify the axis
-            Vector3* a;
+            Vector3 a;
               switch ((int) currentEvent.d) {
                 case 3:
-                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*cos(2*math::pi*dl),
+                  a = Vector3(this->currentEvent.v1.x + this->currentEvent.e*cos(2*math::pi*dl),
                                   this->currentEvent.v1.y + this->currentEvent.e*sin(2*math::pi*dl),
                                   this->currentEvent.v1.z);
                 break;
                 case 2:
-                  a = new Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*math::pi*dl),
+                  a = Vector3(this->currentEvent.v1.x + this->currentEvent.e*sin(2*math::pi*dl),
                                   this->currentEvent.v1.y,
                                   this->currentEvent.v1.z + this->currentEvent.e*cos(2*math::pi*dl));
                 break;
                 case 1:
-                  a = new Vector3(this->currentEvent.v1.x,
+                  a = Vector3(this->currentEvent.v1.x,
                                   this->currentEvent.v1.y + this->currentEvent.e*sin(2*math::pi*dl),
                                   this->currentEvent.v1.z + this->currentEvent.e*cos(2*math::pi*dl));
@@ -246 +246 @@
               }
 
-            this->entity_->setPosition(*a);
+            this->entity_->setPosition(a);
 
             /* Look at the specified position */

code/trunk/src/orxonox/controllers/SectionController.cc

@@ -59 +59 @@
     void SectionController::action()
     {
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
 
@@ -66 +66 @@
         {
             ActionpointController* newDivisionLeader = findNewDivisionLeader();
-            if (!this || !this->getControllableEntity())
-                return;
 
             this->myDivisionLeader_ = newDivisionLeader;
@@ -78 +76 @@
         {
             ActionpointController::action();
-            if (!this || !this->getControllableEntity())
-                return;
             if (!(this->parsedActionpoints_.empty() && this->loopActionpoints_.empty()))
             {
@@ -98 +94 @@
             else if (!this->myDivisionLeader_->bKeepFormation_)
             {
-                if (!this || !this->getControllableEntity())
-                    return;
 
                 if (!this->hasTarget())
@@ -121 +115 @@
         if (action == Action::FIGHT || action == Action::FIGHTALL || action == Action::ATTACK)
         {
-            Pawn* target;
+            Pawn* target = nullptr;
             //----if he has a target----
             if (this->myDivisionLeader_->hasTarget())

code/trunk/src/orxonox/controllers/WingmanController.cc

@@ -58 +58 @@
     void WingmanController::action()
     {
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
         //----If no leader, find one----
@@ -64 +64 @@
         {
             ActionpointController* newLeader = (findNewLeader());
-            if (!this || !this->getControllableEntity())
-                return;
 
             this->myLeader_ = newLeader;
@@ -92 +90 @@
             else if (!this->myLeader_->bKeepFormation_)
             {
-                if (!this || !this->getControllableEntity())
-                    return;
 
                 if (!this->hasTarget())

code/trunk/src/orxonox/gametypes/LastManStanding.cc

@@ -88 +88 @@
                 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                     return true;
-                const std::string& message = ""; // resets Camper-Warning-message
+                const std::string message = ""; // resets Camper-Warning-message
                 this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
             }
@@ -195 +195 @@
             if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                 return;
-            const std::string& message = ""; // resets Camper-Warning-message
+            const std::string message = ""; // resets Camper-Warning-message
             this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
         }
@@ -262 +262 @@
                         if (mapEntry.first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                             return;
-                        const std::string& message = ""; // resets Camper-Warning-message
+                        const std::string message = ""; // resets Camper-Warning-message
                         this->gtinfo_->sendFadingMessage(message,mapEntry.first->getClientID());
                     }
@@ -270 +270 @@
                     if (mapEntry.first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                         continue;
-                    const std::string& message = "Camper Warning! Don't forget to shoot.";
+                    const std::string message = "Camper Warning! Don't forget to shoot.";
                     this->gtinfo_->sendFadingMessage(message,mapEntry.first->getClientID());
                 }

code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

@@ -136 +136 @@
                 if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                     return true;
-                const std::string& message = ""; // resets Camper-Warning-message
+                const std::string message = ""; // resets Camper-Warning-message
                 this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
             }
@@ -170 +170 @@
             if (it->first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                 return;
-            const std::string& message = ""; // resets Camper-Warning-message
+            const std::string message = ""; // resets Camper-Warning-message
             this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
         }
@@ -209 +209 @@
                         if (mapEntry.first->getClientID() == NETWORK_PEER_ID_UNKNOWN)
                             return;
-                        const std::string& message = ""; // resets Camper-Warning-message
+                        const std::string message = ""; // resets Camper-Warning-message
                         this->gtinfo_->sendFadingMessage(message, mapEntry.first->getClientID());
                     }
@@ -217 +217 @@
                   if (mapEntry.first->getClientID()== NETWORK_PEER_ID_UNKNOWN)
                         continue;
-                    const std::string& message = "Camper Warning! Don't forget to shoot.";
+                    const std::string message = "Camper Warning! Don't forget to shoot.";
                     this->gtinfo_->sendFadingMessage(message, mapEntry.first->getClientID());
                 }

code/trunk/src/orxonox/graphics/LensFlare.cc

@@ -34 +34 @@
 #include "LensFlare.h"
 
+#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "graphics/Billboard.h"
 #include "CameraManager.h"
+#include "Camera.h"
 #include "RenderQueueListener.h"
+#include "Scene.h"
 
 #include <OgreSphere.h>
 #include <OgreRenderWindow.h>
+#include <OgreCamera.h>
 
 namespace orxonox

code/trunk/src/orxonox/graphics/LensFlare.h

@@ -41 +41 @@
 #include "core/GraphicsManager.h"
 #include "util/Math.h"
+#include "tools/interfaces/Tickable.h"
 #include "worldentities/StaticEntity.h"
 #include "graphics/Billboard.h"

code/trunk/src/orxonox/weaponsystem/Munition.cc

@@ -544 +544 @@
         if (bUseReloadTime && munition->reloadTime_ > 0 && munition->deployment_ != MunitionDeployment::Stack)
         {
-            const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
+            const ExecutorPtr executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);
 

code/trunk/src/orxonox/worldentities/StaticEntity.cc

@@ -54 +54 @@
     void StaticEntity::registerVariables()
     {
-        registerVariable(this->getPosition(),    VariableDirection::ToClient, new NetworkCallback<StaticEntity>(this, &StaticEntity::positionChanged));
-        registerVariable(this->getOrientation(), VariableDirection::ToClient, new NetworkCallback<StaticEntity>(this, &StaticEntity::orientationChanged));
+        // Ugly const casts, but are valid because position and orientation are not actually const
+        registerVariable(const_cast<Vector3&>(this->getPosition()),    VariableDirection::ToClient, new NetworkCallback<StaticEntity>(this, &StaticEntity::positionChanged));
+        registerVariable(const_cast<Quaternion&>(this->getOrientation()), VariableDirection::ToClient, new NetworkCallback<StaticEntity>(this, &StaticEntity::orientationChanged));
     }
 

code/trunk/src/orxonox/worldentities/WorldEntity.cc

@@ -190 +190 @@
         registerVariable(this->bVisible_,       VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::changedVisibility));
 
-        registerVariable(this->getScale3D(),    VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::scaleChanged));
+        // Ugly const cast, but is valid because the scale is not actually const
+        registerVariable(const_cast<Vector3&>(this->getScale3D()),    VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::scaleChanged));
 
         // Physics stuff

code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -46 +46 @@
             virtual ~FpsPlayer();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
             void registerVariables();
             void setConfigValues();
 
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
-            virtual void moveUpDown(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
+            virtual void moveUpDown(const Vector2& value) override;
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
 
@@ -65 +65 @@
                 { return this->meshSrc_; }
 
-            void boost(bool bBoost); //acctually jump
+            void boost(bool bBoost) override; //actually jump
 
             virtual void fire();
@@ -71 +71 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
-            virtual void addedWeaponPack(WeaponPack* wPack);
+            virtual void addedWeaponPack(WeaponPack* wPack) override;
 
         protected:
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void startLocalHumanControl();
+            virtual void setPlayer(PlayerInfo* player) override;
+            virtual void startLocalHumanControl() override;
             bool bInvertYAxis_;
 
@@ -89 +89 @@
 
         private:
-            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
+            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override;
             float speed_;
 

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -235 +235 @@
 
         // This function call adds a lift to the ship when it is rotating to make it's movement more "realistic" and enhance the feeling.
-        if (this->getLocalVelocity().z < 0 && abs(this->getLocalVelocity().z) < stallSpeed_)
-            this->moveRightLeft(-lift_ / 5.0f * value * sqrt(abs(this->getLocalVelocity().z)));
+        if (this->getLocalVelocity().z < 0 && std::abs(this->getLocalVelocity().z) < stallSpeed_)
+            this->moveRightLeft(-lift_ / 5.0f * value * sqrt(std::abs(this->getLocalVelocity().z)));
     }
 
@@ -257 +257 @@
 
         // This function call adds a lift to the ship when it is pitching to make it's movement more "realistic" and enhance the feeling.
-        if (this->getLocalVelocity().z < 0 && abs(this->getLocalVelocity().z) < stallSpeed_)
-            this->moveUpDown(lift_ / 5.0f * pitch * sqrt(abs(this->getLocalVelocity().z)));
+        if (this->getLocalVelocity().z < 0 && std::abs(this->getLocalVelocity().z) < stallSpeed_)
+            this->moveUpDown(lift_ / 5.0f * pitch * sqrt(std::abs(this->getLocalVelocity().z)));
     }
 
@@ -505 +505 @@
             this->shakeDt_ += dt;
 
-            float frequency = this->shakeFrequency_ * (square(abs(this->getLocalVelocity().z)));
+            float frequency = this->shakeFrequency_ * (square(std::abs(this->getLocalVelocity().z)));
 
             if (this->shakeDt_ >= 1.0f/frequency)