Changeset 10817 for code/branches/cpp11_v2/src/modules/dodgerace

Timestamp:

Nov 19, 2015, 11:40:28 AM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

Location:

code/branches/cpp11_v2/src/modules/dodgerace

Files:

• DodgeRace.h (modified) (2 diffs)
• DodgeRaceCenterPoint.h (modified) (1 diff)
• DodgeRaceHUDinfo.h (modified) (1 diff)
• DodgeRaceShip.h (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h

@@ -69 +69 @@
             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 +85 @@
             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.

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h

@@ -50 +50 @@
             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:

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h

@@ -44 +44 @@
             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)

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h

@@ -52 +52 @@
             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 +74 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
 
         private: