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

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/invader

Files:

• Invader.h (modified) (1 diff)
• InvaderCenterPoint.h (modified) (1 diff)
• InvaderEnemy.h (modified) (1 diff)
• InvaderEnemyShooter.h (modified) (1 diff)
• InvaderHUDinfo.h (modified) (1 diff)
• InvaderShip.h (modified) (2 diffs)
• InvaderWeapon.h (modified) (1 diff)
• InvaderWeaponEnemy.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/invader/Invader.h

@@ -49 +49 @@
             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();

code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h

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

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

@@ -46 +46 @@
             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;}
 

code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h

@@ -47 +47 @@
             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();

code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h

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

code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

@@ -47 +47 @@
             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 +67 @@
 
         protected:
-            virtual void death();
+            virtual void death() override;
         private:
             Invader* getGame();

code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h

@@ -48 +48 @@
             virtual ~InvaderWeapon();
         protected:
-            virtual void shot();
+            virtual void shot() override;
             WeakPtr<Projectile> projectile;
     };

code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h

@@ -47 +47 @@
             InvaderWeaponEnemy(Context* context);
         protected:
-            virtual void shot();
+            virtual void shot() override;
     };
 }