Index: code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/CreateStars.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/designtools/CreateStars.h	(revision 10817)
@@ -43,5 +43,5 @@
             void createBillboards();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setNumStars(int num) {
Index: code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h	(revision 10817)
@@ -65,5 +65,5 @@
             SkyboxGenerator();
             virtual ~SkyboxGenerator();
-            void tick(float dt); // This is where the skybox generation happens.
+            void tick(float dt) override; // This is where the skybox generation happens.
             static void createSkybox(void); // Generate the 6 faces of a skybox.
             void setConfigValues(void); // Sets some config values.
Index: code/branches/cpp11_v2/src/modules/docking/Dock.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/Dock.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/docking/Dock.h	(revision 10817)
@@ -65,6 +65,6 @@
 
             // XML interface
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             // XML functions
Index: code/branches/cpp11_v2/src/modules/docking/DockToShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockToShip.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/docking/DockToShip.h	(revision 10817)
@@ -60,10 +60,10 @@
             virtual ~DockToShip();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setTargetId(const std::string& str);
             const std::string& getTargetId() const;
 
-            virtual bool docking(PlayerInfo* player); //!< Called when docking starts
-            virtual bool release(PlayerInfo* player); //!< Called when player wants undock
+            virtual bool docking(PlayerInfo* player) override; //!< Called when docking starts
+            virtual bool release(PlayerInfo* player) override; //!< Called when player wants undock
         private:
             std::string target_;
Index: code/branches/cpp11_v2/src/modules/docking/DockingController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockingController.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/docking/DockingController.h	(revision 10817)
@@ -45,5 +45,5 @@
             virtual ~DockingController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             void takeControl(bool docking);
@@ -53,5 +53,5 @@
 
         protected:
-            virtual void positionReached();
+            virtual void positionReached() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/docking/DockingTarget.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockingTarget.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/docking/DockingTarget.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~DockingTarget();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
     };
Index: code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h	(revision 10817)
@@ -59,6 +59,6 @@
             virtual ~MoveToDockingTarget();
 
-            virtual bool docking(PlayerInfo* player); //!< Called when a player starts docking
-            virtual bool release(PlayerInfo* player); //!< Called when player wants to undock
+            virtual bool docking(PlayerInfo* player) override; //!< Called when a player starts docking
+            virtual bool release(PlayerInfo* player) override; //!< Called when player wants to undock
     };
 
Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h	(revision 10817)
@@ -69,10 +69,10 @@
             DodgeRace(Context* context);
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void playerPreSpawn(PlayerInfo* player);
+            virtual void playerPreSpawn(PlayerInfo* player) override;
 
             void levelUp();
@@ -85,5 +85,5 @@
             void setCenterpoint(DodgeRaceCenterPoint* center)
                        { this->center_ = center; }
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
             // checks if multiplier should be reset.
Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h	(revision 10817)
@@ -50,5 +50,5 @@
             DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h	(revision 10817)
@@ -44,7 +44,7 @@
             DodgeRaceHUDinfo(Context* context);
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowPoints(bool value)
Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10817)
@@ -52,19 +52,19 @@
             DodgeRaceShip(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // overwrite for 2d movement
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
 
             // Starts or stops fireing
-            virtual void boost(bool bBoost);
+            virtual void boost(bool bBoost) override;
 
             //no rotation!
-            virtual void rotateYaw(const Vector2& value){};
-            virtual void rotatePitch(const Vector2& value){};
+            virtual void rotateYaw(const Vector2& value) override{};
+            virtual void rotatePitch(const Vector2& value) override{};
 
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();};
 
             virtual void updateLevel();
@@ -74,5 +74,5 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h	(revision 10817)
@@ -48,9 +48,9 @@
             virtual ~OldRaceCheckPoint();
 
-            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;
 
             protected:
-            virtual void triggered(bool bIsTriggered);
+            virtual void triggered(bool bIsTriggered) override;
             inline void setLast(bool isLast)
                 { this->bIsLast_ = isLast; }
@@ -64,5 +64,5 @@
             inline float getTimeLimit()
                 { return this->bTimeLimit_;}
-            inline const WorldEntity* getWorldEntity() const
+            inline const WorldEntity* getWorldEntity() const override
                 { return this; }
 
Index: code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h	(revision 10817)
@@ -55,9 +55,9 @@
             virtual ~OldSpaceRace() {}
 
-            virtual void start();
-            virtual void end();
+            virtual void start() override;
+            virtual void end() override;
 
             virtual void newCheckpointReached();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
                                                         //<! This is only a temporary solution. Better: create racingBots.
 
Index: code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h	(revision 10817)
@@ -48,5 +48,5 @@
             virtual ~RaceCheckPoint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setCheckpointIndex(int checkpointIndex)
@@ -92,7 +92,7 @@
         protected:
 
-            virtual void fire(bool bIsTriggered, BaseObject* originator);
+            virtual void fire(bool bIsTriggered, BaseObject* originator) override;
 
-            inline const WorldEntity* getWorldEntity() const
+            inline const WorldEntity* getWorldEntity() const override
             {
                 return this;
Index: code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h	(revision 10817)
@@ -57,7 +57,7 @@
             virtual ~SpaceRace() {}
 
-            void tick(float dt);
+            void tick(float dt) override;
 
-            virtual void end();
+            virtual void end() override;
 
             void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
@@ -70,7 +70,7 @@
                 { return this->clock_; }
 
-            bool allowPawnHit(Pawn* victim, Pawn* originator);
-            bool allowPawnDamage(Pawn* victim, Pawn* originator);
-            bool allowPawnDeath(Pawn* victim, Pawn* originator);
+            bool allowPawnHit(Pawn* victim, Pawn* originator) override;
+            bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
+            bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h	(revision 10817)
@@ -42,6 +42,6 @@
             SpaceRaceController(Context* context);
             virtual ~SpaceRaceController();
-            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;
 
         private:
Index: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~SpaceRaceManager() ;
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void addCheckpoint(RaceCheckPoint* checkpoint);
@@ -69,5 +69,5 @@
             std::vector<RaceCheckPoint*> getAllCheckpoints();
 
-            void tick(float dt);
+            void tick(float dt) override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/invader/Invader.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10817)
@@ -49,7 +49,7 @@
             Invader(Context* context);
 
-            virtual void start();
-            virtual void end();
-            virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+            virtual void start() override;
+            virtual void end() override;
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
             void spawnEnemy();
Index: code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h	(revision 10817)
@@ -47,5 +47,5 @@
             InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10817)
@@ -46,7 +46,7 @@
             InvaderEnemy(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
             virtual void setPlayer(InvaderShip* player){this->player = player;}
 
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h	(revision 10817)
@@ -47,6 +47,6 @@
             InvaderEnemyShooter(Context* context);
 
-            virtual void tick(float dt);
-            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+            virtual void tick(float dt) override;
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
         protected:
             void shoot();
Index: code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h	(revision 10817)
@@ -40,7 +40,7 @@
             InvaderHUDinfo(Context* context);
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10817)
@@ -47,18 +47,18 @@
             InvaderShip(Context* context);
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
             // overwrite for 2d movement
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
+            virtual void moveFrontBack(const Vector2& value) override;
+            virtual void moveRightLeft(const Vector2& value) override;
 
             // Starts or stops fireing
-            virtual void boost(bool bBoost);
+            virtual void boost(bool bBoost) override;
 
             //no rotation!
-            virtual void rotateYaw(const Vector2& value){}; 
-            virtual void rotatePitch(const Vector2& value){};
+            virtual void rotateYaw(const Vector2& value) override{}; 
+            virtual void rotatePitch(const Vector2& value) override{};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateRoll(const Vector2& value) override;
 
             virtual void updateLevel();
@@ -67,5 +67,5 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
         private:
             Invader* getGame();
Index: code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10817)
@@ -48,5 +48,5 @@
             virtual ~InvaderWeapon();
         protected:
-            virtual void shot();
+            virtual void shot() override;
             WeakPtr<Projectile> projectile;
     };
Index: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10817)
@@ -47,5 +47,5 @@
             InvaderWeaponEnemy(Context* context);
         protected:
-            virtual void shot();
+            virtual void shot() override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/jump/Jump.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.cc	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.cc	(revision 10817)
@@ -98,5 +98,5 @@
                 if (screenShiftSinceLastUpdate_ > center_->getSectionLength())
                 {
-                    if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == false && figure_->rocketActive_ == false && addAdventure(adventureNumber_) == true)
+                    if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == nullptr && figure_->rocketActive_ == nullptr && addAdventure(adventureNumber_) == true)
                     {
                         screenShiftSinceLastUpdate_ -= 2*center_->getSectionLength();
Index: code/branches/cpp11_v2/src/modules/jump/Jump.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.h	(revision 10817)
@@ -40,8 +40,8 @@
             Jump(Context* context);
             virtual ~Jump();
-            virtual void tick(float dt);
-            virtual void start();
-            virtual void end();
-            virtual void spawnPlayer(PlayerInfo* player);
+            virtual void tick(float dt) override;
+            virtual void start() override;
+            virtual void end() override;
+            virtual void spawnPlayer(PlayerInfo* player) override;
             int getScore(PlayerInfo* player) const;
             float getFuel() const;
Index: code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpBoots.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpBoots.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpBoots(Context* context);
             virtual ~JumpBoots();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h	(revision 10817)
@@ -108,5 +108,5 @@
             JumpCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Jump.
             virtual ~JumpCenterpoint() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a JumpCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a JumpCenterpoint through XML.
             void setPlatformStaticTemplate(const std::string& balltemplate)
                 { this->platformStaticTemplate_ = balltemplate; }
Index: code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpEnemy(Context* context);
             virtual ~JumpEnemy();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setFieldDimension(float width, float height)
                 { this->fieldWidth_ = width; this->fieldHeight_ = height; }
Index: code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc	(revision 10817)
@@ -319,5 +319,5 @@
     bool JumpFigure::StartShield(JumpShield* shield)
     {
-        if (shieldActive_ == false)
+        if (shieldActive_ == nullptr)
         {
             attach(shield);
Index: code/branches/cpp11_v2/src/modules/jump/JumpFigure.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpFigure.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpFigure.h	(revision 10817)
@@ -40,13 +40,13 @@
             JumpFigure(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~JumpFigure() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
             virtual void JumpFromPlatform(JumpPlatform* platform);
             virtual void JumpFromSpring(JumpSpring* spring);
Index: code/branches/cpp11_v2/src/modules/jump/JumpItem.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpItem.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpItem.h	(revision 10817)
@@ -47,6 +47,6 @@
             JumpItem(Context* context);
             virtual ~JumpItem();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
             virtual void setFigure(JumpFigure* newFigure);
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpPlatform(Context* context);
             virtual ~JumpPlatform();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             void setFigure(JumpFigure* newFigure);
             virtual void touchFigure();
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h	(revision 10817)
@@ -46,9 +46,9 @@
             JumpPlatformDisappear(Context* context);
             virtual ~JumpPlatformDisappear();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(bool active);
             virtual bool isActive();
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h	(revision 10817)
@@ -46,6 +46,6 @@
             JumpPlatformFake(Context* context);
             virtual ~JumpPlatformFake();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h	(revision 10817)
@@ -41,8 +41,8 @@
             JumpPlatformHMove(Context* context);
             virtual ~JumpPlatformHMove();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h	(revision 10817)
@@ -41,8 +41,8 @@
             virtual ~JumpPlatformStatic();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void touchFigure();
+            virtual void touchFigure() override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h	(revision 10817)
@@ -46,9 +46,9 @@
             JumpPlatformTimer(Context* context);
             virtual ~JumpPlatformTimer();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float time);
             virtual bool isActive(void);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
             void setEffectPath(const std::string& effectPath)
Index: code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h	(revision 10817)
@@ -40,8 +40,8 @@
             JumpPlatformVMove(Context* context);
             virtual ~JumpPlatformVMove();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
-            virtual void touchFigure();
+            virtual void touchFigure() override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~JumpProjectile();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setFieldDimension(float width, float height)
Index: code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpPropeller(Context* context);
             virtual ~JumpPropeller();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpRocket.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpRocket.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpRocket(Context* context);
             virtual ~JumpRocket();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpScore.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpScore.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~JumpScore();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             void setShowScore(const bool showScore)
Index: code/branches/cpp11_v2/src/modules/jump/JumpShield.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpShield.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpShield.h	(revision 10817)
@@ -40,7 +40,7 @@
             JumpShield(Context* context);
             virtual ~JumpShield();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void touchFigure();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void touchFigure() override;
             virtual float getFuelState();
         protected:
Index: code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpSpring.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/jump/JumpSpring.h	(revision 10817)
@@ -40,8 +40,8 @@
             JumpSpring(Context* context);
             virtual ~JumpSpring();
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void accelerateFigure();
-            virtual void touchFigure();
+            virtual void touchFigure() override;
         protected:
             float stretch_;
Index: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h	(revision 10817)
@@ -65,8 +65,8 @@
             virtual ~Mini4Dgame(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(void); //!< Starts the Mini4Dgame minigame.
-            virtual void end(void); ///!< Ends the Mini4Dgame minigame.
+            virtual void start(void) override; //!< Starts the Mini4Dgame minigame.
+            virtual void end(void) override; ///!< Ends the Mini4Dgame minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
 
             void setGameboard(Mini4DgameBoard* board)
@@ -84,5 +84,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns player.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
 
 
Index: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h	(revision 10817)
@@ -74,5 +74,5 @@
             //virtual ~Mini4DgameBoard();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             bool isValidMove(const Mini4DgamePosition& move);
Index: code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h	(revision 10817)
@@ -79,6 +79,6 @@
             virtual ~NotificationDispatcher(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a NotificationDispatcher object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h	(revision 10817)
@@ -120,5 +120,5 @@
             virtual ~NotificationManager();
 
-            virtual void preDestroy(void); // Is called before the object is destroyed.
+            virtual void preDestroy(void) override; // Is called before the object is destroyed.
 
             /**
@@ -128,6 +128,6 @@
             static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
 
-            virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type);
-            virtual bool executeCommand(notificationCommand::Value command, const std::string& sender);
+            virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type) override;
+            virtual bool executeCommand(notificationCommand::Value command, const std::string& sender) override;
 
             bool registerNotification(Notification* notification); // Registers a Notification within the NotificationManager.
Index: code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h	(revision 10817)
@@ -97,8 +97,8 @@
             virtual ~NotificationQueue();
 
-            virtual void tick(float dt); // To update from time to time.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-            virtual void changedName(void);
+            virtual void tick(float dt) override; // To update from time to time.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
+            virtual void changedName(void) override;
             
             void update(void); // Updates the NotificationQueue.
Index: code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h	(revision 10817)
@@ -73,7 +73,7 @@
             virtual ~NotificationQueueCEGUI();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedName(void);
+            virtual void changedName(void) override;
 
             void destroy(bool noGraphics = false); // Destroys the NotificationQueue.
@@ -136,11 +136,11 @@
             void registerVariables();
             
-            virtual void create(void); // Creates the NotificationQueue in lua.
+            virtual void create(void) override; // Creates the NotificationQueue in lua.
             
-            virtual void notificationPushed(Notification* notification); // Is called by the NotificationQueue when a Notification was pushed
-            virtual void notificationPopped(void); // Is called by the NotificationQueue when a Notification was popped.
-            virtual void notificationRemoved(unsigned int index); // Is called when a Notification was removed.
+            virtual void notificationPushed(Notification* notification) override; // Is called by the NotificationQueue when a Notification was pushed
+            virtual void notificationPopped(void) override; // Is called by the NotificationQueue when a Notification was popped.
+            virtual void notificationRemoved(unsigned int index) override; // Is called when a Notification was removed.
             
-            virtual void clear(bool noGraphics = false); // Clears the NotificationQueue by removing all NotificationContainers.
+            virtual void clear(bool noGraphics = false) override; // Clears the NotificationQueue by removing all NotificationContainers.
 
         protected:
Index: code/branches/cpp11_v2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Attacher.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/Attacher.h	(revision 10817)
@@ -51,9 +51,9 @@
             virtual ~Attacher() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void processEvent(Event& event);
-            virtual void changedActivity();
-            virtual void changedVisibility();
+            virtual void processEvent(Event& event) override;
+            virtual void changedActivity() override;
+            virtual void changedVisibility() override;
 
             void addObject(WorldEntity* object);
@@ -64,5 +64,5 @@
                 { return this->targetname_; }
 
-            void loadedNewXMLName(BaseObject* object);
+            void loadedNewXMLName(BaseObject* object) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/objects/ForceField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/ForceField.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/ForceField.h	(revision 10817)
@@ -92,7 +92,7 @@
             virtual ~ForceField();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a ForceField object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a ForceField object through XML.
             void registerVariables(); //!< Registers the variables that should get synchronised over the network
-            virtual void tick(float dt); //!< A method that is called every tick.
+            virtual void tick(float dt) override; //!< A method that is called every tick.
             
 
Index: code/branches/cpp11_v2/src/modules/objects/Planet.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Planet.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/Planet.h	(revision 10817)
@@ -52,9 +52,9 @@
             virtual ~Planet();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
             inline void setMeshSource(const std::string& meshname)
Index: code/branches/cpp11_v2/src/modules/objects/Script.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Script.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/Script.h	(revision 10817)
@@ -98,6 +98,6 @@
             virtual ~Script();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Script object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Script object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a port that can be used to channel events and react to them.
 
             bool trigger(bool triggered, BaseObject* trigger); //!< Is called when an event comes in trough the event port.
@@ -168,6 +168,6 @@
                 { return this->forAll_; }
 
-            virtual void clientConnected(unsigned int clientId); //!< Callback that is called when a new client has connected.
-            virtual void clientDisconnected(unsigned int clientid) {}
+            virtual void clientConnected(unsigned int clientId) override; //!< Callback that is called when a new client has connected.
+            virtual void clientDisconnected(unsigned int clientid) override {}
 
         private:
Index: code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h	(revision 10817)
@@ -93,7 +93,7 @@
             int getReaction();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void tick(float dt);
+            void tick(float dt) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/objects/Turret.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Turret.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/objects/Turret.h	(revision 10817)
@@ -61,12 +61,12 @@
             virtual ~Turret();
 
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             virtual float isInRange(const WorldEntity* target);
             virtual void aimAtPosition(const Vector3 &position);
 
-            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;
 
             /** @brief Sets the maximum distance the turret is allowed to shoot. @param radius The distance*/
Index: code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h	(revision 10817)
@@ -44,6 +44,6 @@
             virtual ~FadeoutText() {}
 
-            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;
 
             inline void setDelay(float delay)
@@ -58,6 +58,6 @@
 
         private:
-            virtual void changedColour();
-            virtual void changedCaption();
+            virtual void changedColour() override;
+            virtual void changedCaption() override;
 
             void fadeout();
Index: code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h	(revision 10817)
@@ -44,11 +44,11 @@
             virtual ~GUIOverlay();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setGUIName(const std::string& name);
             inline const std::string& getGUIName() const { return this->guiName_; }
 
-            virtual void changedVisibility();
-            virtual void changedOwner();
+            virtual void changedVisibility() override;
+            virtual void changedOwner() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/OverlayText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/OverlayText.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/OverlayText.h	(revision 10817)
@@ -52,5 +52,5 @@
         virtual ~OverlayText();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setCaption(const std::string& caption);
@@ -76,5 +76,5 @@
 
     protected:
-        virtual void sizeChanged();
+        virtual void sizeChanged() override;
         virtual void changedColour() {}
         virtual void changedCaption() {}
Index: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugFPSText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugPositionText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h	(revision 10817)
@@ -43,5 +43,5 @@
         virtual ~DebugRTRText();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
     };
 }
Index: code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~AnnounceMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void announcemessage(const GametypeInfo* gtinfo, const std::string& message);
+            void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h	(revision 10817)
@@ -49,5 +49,5 @@
 
         protected:
-            virtual void incomingChat(const std::string& message, const std::string& name);
+            virtual void incomingChat(const std::string& message, const std::string& name) override;
 
             std::list<Ogre::DisplayString> messages_;
Index: code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h	(revision 10817)
@@ -44,7 +44,7 @@
             virtual ~CountDown();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
-            virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
+            virtual void tick(float dt) override;
 
             inline void setCounter(float value)
Index: code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~DeathMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void deathmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~GametypeFadingMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h	(revision 10817)
@@ -46,7 +46,7 @@
             virtual ~GametypeStaticMessage();
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
+            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h	(revision 10817)
@@ -51,5 +51,5 @@
         virtual ~BarColour() { }
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void setColour(const ColourValue& colour) { this->colour_ = colour; }
@@ -71,5 +71,5 @@
         virtual ~HUDBar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         void clearColours();
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h	(revision 10817)
@@ -43,6 +43,6 @@
         virtual ~HUDBoostBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc	(revision 10817)
@@ -30,4 +30,5 @@
 
 #include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "worldentities/pawns/Pawn.h"
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h	(revision 10817)
@@ -41,7 +41,7 @@
 
             void setConfigValues();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            void changedOwner();
+            void changedOwner() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h	(revision 10817)
@@ -45,10 +45,10 @@
             virtual ~HUDHealthBar();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            virtual void changedOwner();
-            virtual void changedOverlayGroup();
-            virtual void changedVisibility();
-            virtual void changedName();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void tick(float dt) override;
+            virtual void changedOwner() override;
+            virtual void changedOverlayGroup() override;
+            virtual void changedVisibility() override;
+            virtual void changedName() override;
 
             inline void setTextFont(const std::string& font)
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h	(revision 10817)
@@ -51,19 +51,19 @@
             void setConfigValues();
 
-            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;
 
             // RadarListener interface
-            virtual void addObject(RadarViewable* object);
-            virtual void removeObject(RadarViewable* viewable);
-            virtual void objectChanged(RadarViewable* viewable);
+            virtual void addObject(RadarViewable* object) override;
+            virtual void removeObject(RadarViewable* viewable) override;
+            virtual void objectChanged(RadarViewable* viewable) override;
 
-            virtual void changedOwner();
-            virtual void sizeChanged();
-            virtual void angleChanged() { }
-            virtual void positionChanged() { }
-            virtual void radarTick(float dt) {}
+            virtual void changedOwner() override;
+            virtual void sizeChanged() override;
+            virtual void angleChanged() override { }
+            virtual void positionChanged() override { }
+            virtual void radarTick(float dt) override {}
 
-            inline float getRadarSensitivity() const
+            inline float getRadarSensitivity() const override
                 { return 1.0f; }
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h	(revision 10817)
@@ -50,6 +50,6 @@
         virtual ~HUDRadar();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void changedOwner();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedOwner() override;
         void setConfigValues();
 
@@ -80,5 +80,5 @@
         void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
 
-        float getRadarSensitivity() const { return this->sensitivity_; }
+        float getRadarSensitivity() const override { return this->sensitivity_; }
         // used also by RadarListener interface!
         void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -89,8 +89,8 @@
 
         // RadarListener interface
-        virtual void addObject(RadarViewable* viewable);
-        virtual void removeObject(RadarViewable* viewable);
-        virtual void objectChanged( RadarViewable* rv );
-        void radarTick(float dt);
+        virtual void addObject(RadarViewable* viewable) override;
+        virtual void removeObject(RadarViewable* viewable) override;
+        virtual void objectChanged( RadarViewable* rv ) override;
+        void radarTick(float dt) override;
         bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
 
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h	(revision 10817)
@@ -44,6 +44,6 @@
         virtual ~HUDSpeedBar();
 
-        virtual void tick(float dt);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void changedOwner() override;
 
     private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h	(revision 10817)
@@ -43,7 +43,7 @@
         virtual ~HUDTimer();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
-        virtual void changedOwner();
+        virtual void changedOwner() override;
 
     private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~KillMessage() {}
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
-            void killmessage(const GametypeInfo* gtinfo, const std::string& message);
+            void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~LastManStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~LastTeamStandingInfos();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowLives(bool value)
Index: code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h	(revision 10817)
@@ -42,8 +42,8 @@
             PauseNotice(Context* context);
 
-            virtual void changedOwner();
+            virtual void changedOwner() override;
 
         protected:
-            virtual void changedTimeFactor(float factor_new, float factor_old);
+            virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h	(revision 10817)
@@ -43,7 +43,7 @@
             virtual ~TeamBaseMatchScore();
 
-            virtual void tick(float dt);
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner();
+            virtual void tick(float dt) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override;
 
             inline void setShowBases(bool value)
Index: code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h	(revision 10817)
@@ -44,5 +44,5 @@
         virtual ~Scoreboard();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
         inline void setCreateLines(CreateLines* cl)
@@ -51,5 +51,5 @@
             { return this->createlines_; }
 
-        virtual void changedVisibility();
+        virtual void changedVisibility() override;
 
     private: // functions
Index: code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h	(revision 10817)
@@ -46,5 +46,5 @@
         void setConfigValues();
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
 
     private: // variables
Index: code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h	(revision 10817)
@@ -61,6 +61,6 @@
             virtual ~CollectiblePickup(); //! Destructor.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
             /**
Index: code/branches/cpp11_v2/src/modules/pickup/Pickup.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/Pickup.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/Pickup.h	(revision 10817)
@@ -103,7 +103,7 @@
             virtual ~Pickup(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -149,8 +149,8 @@
                 { return this->getDurationType() == pickupDurationType::continuous; }
 
-            virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
             /**
Index: code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h	(revision 10817)
@@ -73,15 +73,15 @@
             virtual ~PickupCollection(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates an instance of this Class through XML.
 
-            virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
-            virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+            virtual void changedCarrier(void) override; //!< Is called when the pickup has changed its PickupCarrier.
+            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
-            virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
+            virtual bool isTarget(const PickupCarrier* carrier) const override; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
 
             inline void setRepresentationName(const std::string& name)
                 { this->representationName_ = name; }
-            virtual const std::string& getRepresentationName() const
+            virtual const std::string& getRepresentationName() const override
                 { return this->representationName_; }
 
@@ -98,5 +98,5 @@
 
         protected:
-            virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
         private:
Index: code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupManager.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupManager.h	(revision 10817)
@@ -117,7 +117,7 @@
             PickupRepresentation* getRepresentation(const std::string& name); // tolua_export
 
-            virtual void pickupChangedUsed(Pickupable* pickup, bool used); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
+            virtual void pickupChangedUsed(Pickupable* pickup, bool used) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
             static void pickupChangedUsedNetwork(uint32_t pickup, bool inUse, bool usable, bool unusable); //!< Helper method to react to the change in the used status of a Pickupable.
-            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
+            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
             static void pickupChangedPickedUpNetwork(uint32_t pickup, bool usable, uint32_t representationObjectId, const std::string& representationName, bool pickedUp); //!< Helper method to react to the change in the pickedUp status of a Pickupable.
 
Index: code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h	(revision 10817)
@@ -98,5 +98,5 @@
             virtual ~PickupRepresentation(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupRepresentation object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupRepresentation object through XML.
 
             /**
@@ -129,5 +129,5 @@
             inline const std::string& getInventoryRepresentation(void) const { return this->inventoryRepresentation_; } // tolua_export
 
-            virtual void changedName();
+            virtual void changedName() override;
 
             StaticEntity* createSpawnerRepresentation(PickupSpawner* spawner); //!< Create a spawnerRepresentation for a specific PickupSpawner.
Index: code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h	(revision 10817)
@@ -82,6 +82,6 @@
             static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
-            virtual void tick(float dt); //!< Tick, checks if any Pawn is close enough to trigger.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;  //!< Method for creating a PickupSpawner through XML.
+            virtual void tick(float dt) override; //!< Tick, checks if any Pawn is close enough to trigger.
 
             /**
Index: code/branches/cpp11_v2/src/modules/pong/Pong.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/Pong.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/Pong.h	(revision 10817)
@@ -68,10 +68,10 @@
             virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(); //!< Starts the Pong minigame.
-            virtual void end(); ///!< Ends the Pong minigame.
+            virtual void start() override; //!< Starts the Pong minigame.
+            virtual void end() override; ///!< Ends the Pong minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
 
-            virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
+            virtual void playerScored(PlayerInfo* player, int score = 1) override; //!< Is called when the player scored.
 
             /**
@@ -87,5 +87,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns players, and fills the rest up with bots.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
 
             void startBall(); //!< Starts the ball with some default speed.
Index: code/branches/cpp11_v2/src/modules/pong/PongAI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongAI.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/PongAI.h	(revision 10817)
@@ -66,5 +66,5 @@
             void setConfigValues();
 
-            virtual void tick(float dt); //!< Implements the behavior of the PongAI (i.e. its intelligence).
+            virtual void tick(float dt) override; //!< Implements the behavior of the PongAI (i.e. its intelligence).
 
             /**
Index: code/branches/cpp11_v2/src/modules/pong/PongBall.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongBall.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/PongBall.h	(revision 10817)
@@ -63,7 +63,7 @@
             virtual ~PongBall();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: code/branches/cpp11_v2/src/modules/pong/PongBat.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongBat.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/PongBat.h	(revision 10817)
@@ -60,10 +60,10 @@
             virtual ~PongBat() {}
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
 
-            virtual void changedPlayer(); //!< Is called when the player changed.
+            virtual void changedPlayer() override; //!< Is called when the player changed.
 
             /**
Index: code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h	(revision 10817)
@@ -124,5 +124,5 @@
             virtual ~PongCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a PongCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a PongCenterpoint through XML.
 
             /**
Index: code/branches/cpp11_v2/src/modules/pong/PongScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongScore.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/pong/PongScore.h	(revision 10817)
@@ -60,7 +60,7 @@
             virtual ~PongScore();
 
-            virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the PongScore.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner(); //!< Is called when the owner changes.
+            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the PongScore.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override; //!< Is called when the owner changes.
 
             /**
Index: code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h	(revision 10817)
@@ -63,11 +63,11 @@
             virtual ~PortalEndPoint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedActivity(void);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedActivity(void) override;
 
             inline void setTarget(const std::string & target)                 //!< add types which are allowed to activate the PortalEndPoint
                 { this->trigger_->addTarget(target); }
 
-            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
             inline void setReenterDelay(unsigned int seconds)
Index: code/branches/cpp11_v2/src/modules/portals/PortalLink.h
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalLink.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/portals/PortalLink.h	(revision 10817)
@@ -56,5 +56,5 @@
             PortalLink(Context* context);
             virtual ~PortalLink();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             inline void setFromID(unsigned int from)    //!< set the ID of the PortalEndPoint which should act as the entrance of this link
Index: code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h	(revision 10817)
@@ -93,17 +93,17 @@
             virtual ~GlobalQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a GlobalQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a GlobalQuest object through XML.
 
-            virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
-            virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
 
         protected:
-            virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
-            virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
-            virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
 
-            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
+            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
 
-            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
 
         private:
Index: code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h	(revision 10817)
@@ -87,16 +87,16 @@
             virtual ~LocalQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a LocalQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a LocalQuest object through XML.
 
-            virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
-            virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
 
         protected:
-            virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
-            virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
-            virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
 
-            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
-            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
+            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
 
         private:
Index: code/branches/cpp11_v2/src/modules/questsystem/Quest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/Quest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/Quest.h	(revision 10817)
@@ -85,5 +85,5 @@
             virtual ~Quest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Quest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Quest object through XML.
 
             /**
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h	(revision 10817)
@@ -67,5 +67,5 @@
             virtual ~QuestDescription();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestDescription object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestDescription object through XML.
 
 // tolua_begin
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h	(revision 10817)
@@ -96,6 +96,6 @@
             virtual ~QuestEffectBeacon();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestEffectBeacon object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestEffectBeacon object through XML.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             bool execute(bool bTriggered, BaseObject* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h	(revision 10817)
@@ -85,5 +85,5 @@
             virtual ~QuestHint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestHint object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestHint object through XML.
 
             bool isActive(const PlayerInfo* player) const; //!< Returns true if the QuestHint is active for the input player.
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h	(revision 10817)
@@ -63,5 +63,5 @@
             virtual ~QuestItem();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestItem object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestItem object through XML.
 
             /**
Index: code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h	(revision 10817)
@@ -90,5 +90,5 @@
             virtual ~QuestListener();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestListener object through XML.
 
             static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
         virtual ~AddQuest();
 
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuest object through XML.
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuest object through XML.
 
-        virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+        virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h	(revision 10817)
@@ -64,7 +64,7 @@
             virtual ~AddQuestHint();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuestHint object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuestHint object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
         private:
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h	(revision 10817)
@@ -68,7 +68,7 @@
             virtual ~AddReward();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddReward object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddReward object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
         private:
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h	(revision 10817)
@@ -59,5 +59,5 @@
             virtual ~ChangeQuestStatus();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a ChangeQuestStatus object through XML.
+            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.
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
             virtual ~CompleteQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CompleteQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a CompleteQuest object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h	(revision 10817)
@@ -62,7 +62,7 @@
             virtual ~FailQuest();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a FailQuest object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a FailQuest object through XML.
 
-            virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
 
     };
Index: code/branches/cpp11_v2/src/modules/tetris/Tetris.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/Tetris.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/tetris/Tetris.h	(revision 10817)
@@ -58,11 +58,11 @@
             virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
 
-            virtual void start(void); //!< Starts the Tetris minigame.
-            virtual void end(void); ///!< Ends the Tetris minigame.
+            virtual void start(void) override; //!< Starts the Tetris minigame.
+            virtual void end(void) override; ///!< Ends the Tetris minigame.
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
-            virtual bool playerLeft(PlayerInfo* player);
+            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
+            virtual bool playerLeft(PlayerInfo* player) override;
 
             void setCenterpoint(TetrisCenterpoint* center);
@@ -77,5 +77,5 @@
 
         protected:
-            virtual void spawnPlayersIfRequested(); //!< Spawns player.
+            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
 
 
Index: code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h	(revision 10817)
@@ -57,7 +57,7 @@
             virtual ~TetrisBrick() {}
 
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void changedPlayer(); //!< Is called when the player changed.
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void changedPlayer() override; //!< Is called when the player changed.
 
             bool isValidMove(const Vector3& position, bool isRotation);
Index: code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h	(revision 10817)
@@ -62,5 +62,5 @@
             virtual ~TetrisCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a TetrisCenterpoint through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a TetrisCenterpoint through XML.
 
             /**
Index: code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h	(revision 10817)
@@ -60,7 +60,7 @@
             virtual ~TetrisScore();
 
-            virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the TetrisScore.
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void changedOwner(); //!< Is called when the owner changes.
+            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the TetrisScore.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void changedOwner() override; //!< Is called when the owner changes.
 
         private:
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h	(revision 10817)
@@ -53,8 +53,8 @@
         virtual ~TowerDefense();        
         void addTowerDefenseEnemy(int templatenr);
-        virtual void start(); //<! The function is called when the gametype starts
-        virtual void end();
-        virtual void tick(float dt);
-        virtual void spawnPlayer(PlayerInfo* player);
+        virtual void start() override; //<! The function is called when the gametype starts
+        virtual void end() override;
+        virtual void tick(float dt) override;
+        virtual void spawnPlayer(PlayerInfo* player) override;
         PlayerInfo* getPlayer(void) const;
         int getCredit(){ return this->credit_; }
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h	(revision 10817)
@@ -52,5 +52,5 @@
             virtual ~TowerDefenseCenterpoint() {}
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /**
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10817)
@@ -37,5 +37,5 @@
         //health gibt es unter: health_
 
-        virtual void tick(float dt);
+        virtual void tick(float dt) override;
         virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
 
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h	(revision 10817)
@@ -62,5 +62,5 @@
             TowerDefenseField(Context* context);
             virtual ~TowerDefenseField() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             const bool isFree() const
                 { return type_==FREE; }
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h	(revision 10817)
@@ -53,7 +53,7 @@
 
 
-        virtual void tick(float dt);
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void changedOwner();
+        virtual void tick(float dt) override;
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedOwner() override;
         void setShowlives(bool temp)
             { this->showlives = temp; }
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h	(revision 10817)
@@ -41,14 +41,14 @@
             TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~TowerDefenseSelecter();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);         
-            virtual void tick(float dt);            
-            virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;         
+            virtual void tick(float dt) override;            
+            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void fire(unsigned int firemode);
-            virtual void fired(unsigned int firemode);
-            virtual void boost(bool bBoost);
+            virtual void fired(unsigned int firemode) override;
+            virtual void boost(bool bBoost) override;
             virtual void setSelectedPosition(TDCoordinate* newPos);
             virtual void setSelectedPosition(int x, int y);
Index: code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h	(revision 10817)
@@ -55,5 +55,5 @@
             IceGunFreezer(Context* context);
             virtual ~IceGunFreezer();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual void startFreezing();
             virtual void stopFreezing();
Index: code/branches/cpp11_v2/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/RocketController.cc	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/RocketController.cc	(revision 10817)
@@ -38,4 +38,5 @@
 #include "projectiles/SimpleRocket.h"
 #include "weaponmodes/SimpleRocketFire.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
Index: code/branches/cpp11_v2/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/RocketController.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/RocketController.h	(revision 10817)
@@ -55,5 +55,5 @@
             virtual ~RocketController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             /**
             @brief Get the rocket that is controlled by this controller.
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h	(revision 10817)
@@ -61,5 +61,5 @@
             virtual void setMaterial(const std::string& material);
             virtual const std::string& getMaterial();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h	(revision 10817)
@@ -41,7 +41,7 @@
             GravityBomb(Context* context);
             virtual ~GravityBomb();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
             void detonate();
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h	(revision 10817)
@@ -39,5 +39,5 @@
     GravityBombField(Context* context);
     virtual ~GravityBombField();
-    virtual void tick(float dt);
+    virtual void tick(float dt) override;
     virtual void destroy();
 
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h	(revision 10817)
@@ -62,5 +62,5 @@
 
         protected:
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
         private:         
             float freezeTime_; //The duration of the freezing effect on a target
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h	(revision 10817)
@@ -58,5 +58,5 @@
             virtual ~LightningGunProjectile() {}
 
-            virtual void setMaterial(const std::string& material);
+            virtual void setMaterial(const std::string& material) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h	(revision 10817)
@@ -53,5 +53,5 @@
             ParticleProjectile(Context* context);
             virtual ~ParticleProjectile();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h	(revision 10817)
@@ -64,6 +64,6 @@
             void setConfigValues();
 
-            virtual void tick(float dt);
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual void tick(float dt) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h	(revision 10817)
@@ -62,17 +62,17 @@
             virtual ~Rocket();
 
-            virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            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;
 
             /**
@@ -114,7 +114,7 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h	(revision 10817)
@@ -62,17 +62,17 @@
             virtual ~RocketOld();
 
-            virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the RocketOld has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            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;
 
             /**
@@ -114,7 +114,7 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h	(revision 10817)
@@ -62,17 +62,17 @@
             SimpleRocket(Context* context);
             virtual ~SimpleRocket();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
             void disableFire(); //!< Method to disable the fire and stop all acceleration
 
-            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;
             void setDestroy();
 
@@ -115,5 +115,5 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
             inline bool hasFuel() const
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h	(revision 10817)
@@ -57,6 +57,6 @@
             virtual ~EnergyDrink() {}
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~FusionFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h	(revision 10817)
@@ -34,5 +34,5 @@
             virtual ~GravityBombFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h	(revision 10817)
@@ -56,6 +56,6 @@
             virtual ~HsW01();
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~IceGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
             
             inline void setFreezeTime(float freezeTime)
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~LaserFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~LightningGun();
 
-            virtual void fire();
+            virtual void fire() override;
 
        private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~RocketFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h	(revision 10817)
@@ -54,5 +54,5 @@
             virtual ~RocketFireOld();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h	(revision 10817)
@@ -53,5 +53,5 @@
             virtual ~SimpleRocketFire();
             void deactivateFire();
-            virtual void fire();
+            virtual void fire() override;
 
         private:
Index: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h	(revision 10774)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h	(revision 10817)
@@ -54,6 +54,6 @@
             virtual ~SplitGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
 
             inline void setNumberOfSplits(int numberOfSplits)
