ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some override warnings

Browse Source
This commit is contained in:
Benau 2017-01-11 13:34:25 +08:00
parent 3105407b2f
commit ffedf637de
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/guiengine/widgets/ribbon_widget.hpp
View File

@ -75,15 +75,15 @@ namespace GUIEngine
void updateSelection();
/** Callbacks */
virtual EventPropagation rightPressed(const int playerID=0);
virtual EventPropagation leftPressed(const int playerID=0);
virtual EventPropagation rightPressed(const int playerID=0) OVERRIDE;
virtual EventPropagation leftPressed(const int playerID=0) OVERRIDE;
virtual EventPropagation mouseHovered(Widget* child,
const int playerID);
const int playerID) OVERRIDE;
virtual EventPropagation transmitEvent(Widget* w,
const std::string& originator,
const int playerID=0);
virtual EventPropagation focused(const int playerID);
virtual void unfocused(const int playerID, Widget* new_focus);
const int playerID=0) OVERRIDE;
virtual EventPropagation focused(const int playerID) OVERRIDE;
virtual void unfocused(const int playerID, Widget* new_focus) OVERRIDE;
PtrVector<irr::gui::IGUIStaticText, REF> m_labels;
@ -109,7 +109,7 @@ namespace GUIEngine
RibbonWidget(const RibbonType type=RIBBON_COMBO);
virtual ~RibbonWidget();
void add();
virtual void add() OVERRIDE;
/** Sets a listener that will be notified of changes on this ribbon.
* Does _not_ take ownership of the listener, i.e. will not delete it.

26
src/karts/controller/ghost_controller.hpp
View File

@ -43,21 +43,21 @@ private:
public:
GhostController(AbstractKart *kart);
virtual ~GhostController() {};
virtual void reset();
virtual void update (float dt);
virtual bool disableSlipstreamBonus() const { return true; }
virtual void crashed(const Material *m) {};
virtual void crashed(const AbstractKart *k) {};
virtual void handleZipper(bool play_sound) {};
virtual void finishedRace(float time) {};
virtual void reset() OVERRIDE;
virtual void update (float dt) OVERRIDE;
virtual bool disableSlipstreamBonus() const OVERRIDE { return true; }
virtual void crashed(const Material *m) OVERRIDE {}
virtual void crashed(const AbstractKart *k) OVERRIDE {}
virtual void handleZipper(bool play_sound) OVERRIDE {}
virtual void finishedRace(float time) OVERRIDE {}
virtual void collectedItem(const Item &item, int add_info=-1,
float previous_energy=0) {};
virtual void setPosition(int p) {};
virtual bool isPlayerController() const { return false; }
virtual bool isLocalPlayerController() const { return false; }
float previous_energy=0) OVERRIDE {}
virtual void setPosition(int p) OVERRIDE {}
virtual bool isPlayerController() const OVERRIDE { return false; }
virtual bool isLocalPlayerController() const OVERRIDE { return false; }
virtual void action(PlayerAction action, int value) OVERRIDE;
virtual void skidBonusTriggered() {};
virtual void newLap(int lap) {};
virtual void skidBonusTriggered() OVERRIDE {}
virtual void newLap(int lap) OVERRIDE {}
void addReplayTime(float time);
// ------------------------------------------------------------------------
bool isReplayEnd() const