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

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

Files:

• Jump.cc (modified) (1 diff)
• Jump.h (modified) (1 diff)
• JumpBoots.h (modified) (1 diff)
• JumpCenterpoint.h (modified) (1 diff)
• JumpEnemy.h (modified) (1 diff)
• JumpFigure.cc (modified) (1 diff)
• JumpFigure.h (modified) (1 diff)
• JumpItem.h (modified) (1 diff)
• JumpPlatform.h (modified) (1 diff)
• JumpPlatformDisappear.h (modified) (1 diff)
• JumpPlatformFake.h (modified) (1 diff)
• JumpPlatformHMove.h (modified) (1 diff)
• JumpPlatformStatic.h (modified) (1 diff)
• JumpPlatformTimer.h (modified) (1 diff)
• JumpPlatformVMove.h (modified) (1 diff)
• JumpProjectile.h (modified) (1 diff)
• JumpPropeller.h (modified) (1 diff)
• JumpRocket.h (modified) (1 diff)
• JumpScore.h (modified) (1 diff)
• JumpShield.h (modified) (1 diff)
• JumpSpring.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/jump/Jump.cc

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

code/branches/cpp11_v2/src/modules/jump/Jump.h

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

code/branches/cpp11_v2/src/modules/jump/JumpBoots.h

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

code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h

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

code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h

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

code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc

@@ -319 +319 @@
     bool JumpFigure::StartShield(JumpShield* shield)
     {
-        if (shieldActive_ == false)
+        if (shieldActive_ == nullptr)
         {
             attach(shield);

code/branches/cpp11_v2/src/modules/jump/JumpFigure.h

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

code/branches/cpp11_v2/src/modules/jump/JumpItem.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h

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

code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h

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

code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h

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

code/branches/cpp11_v2/src/modules/jump/JumpRocket.h

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

code/branches/cpp11_v2/src/modules/jump/JumpScore.h

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

code/branches/cpp11_v2/src/modules/jump/JumpShield.h

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

code/branches/cpp11_v2/src/modules/jump/JumpSpring.h

@@ -40 +40 @@
             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_;