Fix more override warnings

This commit is contained in:
Benau 2018-07-19 00:35:56 +08:00
parent d14916dec2
commit 5e7ec89002
5 changed files with 6 additions and 6 deletions

View File

@ -204,7 +204,7 @@ public:
void setHasHit () { m_has_hit_something = true; }
// ------------------------------------------------------------------------
/** Resets this flyable. */
void reset () { Moveable::reset(); }
void reset() OVERRIDE { Moveable::reset(); }
// ------------------------------------------------------------------------
/** Returns the type of flyable. */
PowerupManager::PowerupType getType() const {return m_type;}

View File

@ -204,8 +204,8 @@ public:
virtual ~RubberBall();
static void init(const XMLNode &node, scene::IMesh *rubberball);
virtual bool updateAndDelete(int ticks) OVERRIDE;
virtual bool hit(AbstractKart* kart, PhysicalObject* obj=NULL);
virtual void setAnimation(AbstractKartAnimation *animation);
virtual bool hit(AbstractKart* kart, PhysicalObject* obj=NULL) OVERRIDE;
virtual void setAnimation(AbstractKartAnimation *animation) OVERRIDE;
// ------------------------------------------------------------------------
/** Returns time (in ticks) between rubberballs, to avoid that in games
* with many karts too many rubber balls are in play at the same time. */

View File

@ -89,7 +89,7 @@ public:
return m_animation_phase == SWATTER_AIMING;
} // isSwatterReady
// ------------------------------------------------------------------------
virtual void onAnimationEnd();
virtual void onAnimationEnd() OVERRIDE;
// ------------------------------------------------------------------------
private:

View File

@ -42,7 +42,7 @@ public:
friend class GUIEngine::ScreenSingleton<OnlineLanScreen>;
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void loadedFromFile() {}
virtual void loadedFromFile() OVERRIDE {}
/** \brief implement callback from parent class GUIEngine::Screen */
virtual void beforeAddingWidget() OVERRIDE;

View File

@ -67,7 +67,7 @@ public:
virtual void trigger(unsigned int kart_index) OVERRIDE;
virtual void changeDebugColor(bool is_active) OVERRIDE;
virtual void update(float dt) OVERRIDE;
virtual bool triggeringCheckline() const { return false; }
virtual bool triggeringCheckline() const OVERRIDE { return false; }
void addFlyable(Flyable *flyable);
void removeFlyable(Flyable *flyable);
}; // CheckLine