Merge remote-tracking branch 'origin/master' into fix_replay

src/graphics/hit_sfx.hpp

@@ -36,7 +36,7 @@ private:
 public:
          HitSFX(const Vec3& coord, const char* explosion_sound);
         ~HitSFX();
-    virtual bool updateAndDelete(float dt);
+    virtual bool updateAndDelete(float dt) OVERRIDE;
     virtual void setLocalPlayerKartHit() OVERRIDE;
 
 };   // HitSFX

src/graphics/stk_text_billboard.hpp

@@ -84,7 +84,7 @@ public:
     virtual void collectChar(irr::video::ITexture* texture,
         const irr::core::rect<irr::s32>& destRect,
         const irr::core::rect<irr::s32>& sourceRect,
-        const irr::video::SColor* const colors);
+        const irr::video::SColor* const colors) OVERRIDE;
 
     virtual void updateAbsolutePosition() OVERRIDE;
 };

src/input/gamepad_config.hpp

@@ -70,7 +70,7 @@ public:
 
     core::stringw toString();
 
-    virtual void save(std::ofstream& stream);
+    virtual void save(std::ofstream& stream) OVERRIDE;
     void        setDefaultBinds     ();
     virtual core::stringw getBindingAsString(const PlayerAction action) const OVERRIDE;
     virtual bool load(const XMLNode *config) OVERRIDE;
@@ -81,7 +81,7 @@ public:
     // ------------------------------------------------------------------------
     /** Returns true if this device should desensitize its input at values
      *  close to 0 (to avoid 'oversteering'). */
-    virtual bool desensitize() const { return m_desensitize;}
+    virtual bool desensitize() const OVERRIDE { return m_desensitize;}
 
     // ------------------------------------------------------------------------
     /** Returns the number of buttons in this configuration. */
@@ -103,9 +103,9 @@ public:
     /** Return deadzone of this configuration. */
     int getDeadzone() const { return m_deadzone; }
     // ------------------------------------------------------------------------
-    virtual bool isGamePad()  const { return true; }
+    virtual bool isGamePad()  const OVERRIDE { return true; }
     // ------------------------------------------------------------------------
-    virtual bool isKeyboard() const { return false; }
+    virtual bool isKeyboard() const OVERRIDE { return false; }
 
 };   // class GamepadConfig
 

src/karts/controller/local_player_controller.hpp

@@ -75,7 +75,7 @@ public:
     virtual bool isLocalPlayerController() const OVERRIDE {return true;}
     // ------------------------------------------------------------------------
     /** Returns the name of the player profile. */
-    core::stringw getName() const { return m_player->getProfile()->getName(); }
+    core::stringw getName() const OVERRIDE { return m_player->getProfile()->getName(); }
 
 
 };   // LocalPlayerController

src/karts/controller/player_controller.hpp

@@ -64,22 +64,22 @@ public:
     {
     }   // setPosition
     // ------------------------------------------------------------------------
-    virtual void crashed(const AbstractKart *k) 
+    virtual void crashed(const AbstractKart *k) OVERRIDE
     {
     }   // crashed(AbstractKart)
     // ------------------------------------------------------------------------
-    virtual void crashed(const Material *m)
+    virtual void crashed(const Material *m) OVERRIDE
     {
     }   // crashed(Material)
     // ------------------------------------------------------------------------
     /** Callback whenever a new lap is triggered. Used by the AI
      *  to trigger a recomputation of the way to use, not used for players. */
-    virtual void  newLap(int lap)
+    virtual void  newLap(int lap) OVERRIDE
     {
     }
     // ------------------------------------------------------------------------
     /** Player will always be able to get a slipstream bonus. */
-    virtual bool  disableSlipstreamBonus() const
+    virtual bool  disableSlipstreamBonus() const OVERRIDE
     {
         return false; 
     }

src/modes/easter_egg_hunt.hpp

@@ -46,20 +46,20 @@ public:
              EasterEggHunt();
     virtual ~EasterEggHunt();
 
-    virtual void init();
+    virtual void init() OVERRIDE;
 
-    virtual bool isRaceOver();
+    virtual bool isRaceOver() OVERRIDE;
 
     // overriding World methods
-    virtual void reset();
+    virtual void reset() OVERRIDE;
 
-    virtual bool raceHasLaps(){ return false; }
+    virtual bool raceHasLaps() OVERRIDE { return false; }
 
-    virtual const std::string& getIdent() const;
-    virtual void terminateRace();
-    virtual void update(float dt);
+    virtual const std::string& getIdent() const OVERRIDE;
+    virtual void terminateRace() OVERRIDE;
+    virtual void update(float dt) OVERRIDE;
     virtual void getKartsDisplayInfo(
-                          std::vector<RaceGUIBase::KartIconDisplayInfo> *info);
+                          std::vector<RaceGUIBase::KartIconDisplayInfo> *info) OVERRIDE;
 
     void updateKartRanks();
     void collectedEasterEgg(const AbstractKart *kart);

src/modes/follow_the_leader.hpp

@@ -48,7 +48,7 @@ public:
     // overriding World methods
     virtual void reset() OVERRIDE;
     virtual const std::string& getIdent() const OVERRIDE;
-    virtual const btTransform &getStartTransform(int index);
+    virtual const btTransform &getStartTransform(int index) OVERRIDE;
     virtual float getClockStartTime() const;
     virtual void getKartsDisplayInfo(
                  std::vector<RaceGUIBase::KartIconDisplayInfo> *info) OVERRIDE;

src/modes/linear_world.hpp

@@ -160,7 +160,7 @@ public:
     // ------------------------------------------------------------------------
     /** Returns the number of laps a kart has completed.
      *  \param kart_index World index of the kart. */
-    int getKartLaps(unsigned int kart_index) const
+    int getKartLaps(unsigned int kart_index) const OVERRIDE
     {
         assert(kart_index < m_kart_info.size());
         return m_kart_info[kart_index].m_race_lap;

src/modes/overworld.hpp

@@ -37,7 +37,7 @@ class OverWorld : public WorldWithRank
 protected:
 
     /** Override from base class */
-    virtual void  createRaceGUI();
+    virtual void  createRaceGUI() OVERRIDE;
 
     bool m_return_to_garage;
 

src/modes/soccer_world.hpp

@@ -50,7 +50,7 @@ protected:
     virtual AbstractKart *createKart(const std::string &kart_ident, int index,
                              int local_player_id, int global_player_id,
                              RaceManager::KartType type,
-                             PerPlayerDifficulty difficulty);
+                             PerPlayerDifficulty difficulty) OVERRIDE;
 
 private:
     /** Keep a pointer to the track object of soccer ball */
@@ -113,27 +113,27 @@ public:
     SoccerWorld();
     virtual ~SoccerWorld();
 
-    virtual void init();
+    virtual void init() OVERRIDE;
 
     // clock events
-    virtual bool isRaceOver();
-    virtual void terminateRace();
+    virtual bool isRaceOver() OVERRIDE;
+    virtual void terminateRace() OVERRIDE;
     virtual void countdownReachedZero() OVERRIDE;
 
     // overriding World methods
-    virtual void reset();
+    virtual void reset() OVERRIDE;
 
     virtual unsigned int getRescuePositionIndex(AbstractKart *kart) OVERRIDE;
 
-    virtual bool useFastMusicNearEnd() const { return false; }
+    virtual bool useFastMusicNearEnd() const OVERRIDE { return false; }
     virtual void getKartsDisplayInfo(
-                 std::vector<RaceGUIBase::KartIconDisplayInfo> *info) {}
+                 std::vector<RaceGUIBase::KartIconDisplayInfo> *info) OVERRIDE {}
 
-    virtual bool raceHasLaps() { return false; }
+    virtual bool raceHasLaps() OVERRIDE { return false; }
 
-    virtual const std::string& getIdent() const;
+    virtual const std::string& getIdent() const OVERRIDE;
 
-    virtual void update(float dt);
+    virtual void update(float dt) OVERRIDE;
     // ------------------------------------------------------------------------
     void onCheckGoalTriggered(bool first_goal);
     // ------------------------------------------------------------------------

src/modes/standard_race.hpp

@@ -29,7 +29,7 @@ class StandardRace : public LinearWorld
 {
 protected:
     // clock events
-    virtual bool  isRaceOver();
+    virtual bool  isRaceOver() OVERRIDE;
 
 public:
                   StandardRace();

src/modes/world.hpp

@@ -175,7 +175,7 @@ protected:
     Weather* m_weather;
 
 
-    virtual void  onGo();
+    virtual void  onGo() OVERRIDE;
     /** Returns true if the race is over. Must be defined by all modes. */
     virtual bool  isRaceOver() = 0;
     virtual void  update(float dt);

src/modes/world_with_rank.hpp

@@ -65,7 +65,7 @@ public:
     /** call just after instanciating. can't be moved to the contructor as child
         classes must be instanciated, otherwise polymorphism will fail and the
         results will be incorrect */
-    virtual void  init();
+    virtual void  init() OVERRIDE;
 
     bool          displayRank() const { return m_display_rank; }
 

src/network/protocols/connect_to_peer.hpp

@@ -54,10 +54,10 @@ public:
              ConnectToPeer(const TransportAddress &address);
     virtual ~ConnectToPeer();
 
-    virtual bool notifyEventAsynchronous(Event* event);
-    virtual void setup();
-    virtual void update() {}
-    virtual void asynchronousUpdate();
+    virtual bool notifyEventAsynchronous(Event* event) OVERRIDE;
+    virtual void setup() OVERRIDE;
+    virtual void update() OVERRIDE {}
+    virtual void asynchronousUpdate() OVERRIDE;
     virtual void callback(Protocol *protocol) OVERRIDE;
 };   // class ConnectToPeer
 

src/network/protocols/connect_to_server.hpp

@@ -61,8 +61,8 @@ public:
 
     virtual bool notifyEventAsynchronous(Event* event) OVERRIDE;
     virtual void setup() OVERRIDE;
-    virtual void asynchronousUpdate();
-    virtual void callback(Protocol *protocol);
+    virtual void asynchronousUpdate() OVERRIDE;
+    virtual void callback(Protocol *protocol) OVERRIDE;
     virtual void update() OVERRIDE {}
     void setServerAddress(const TransportAddress &address);
 };   // class ConnectToServer

src/network/protocols/server_lobby_room_protocol.hpp

@@ -45,10 +45,10 @@ public:
              ServerLobbyRoomProtocol();
     virtual ~ServerLobbyRoomProtocol();
 
-    virtual bool notifyEventAsynchronous(Event* event);
-    virtual void setup();
-    virtual void update();
-    virtual void asynchronousUpdate() {};
+    virtual bool notifyEventAsynchronous(Event* event) OVERRIDE;
+    virtual void setup() OVERRIDE;
+    virtual void update() OVERRIDE;
+    virtual void asynchronousUpdate() OVERRIDE {};
 
     void startGame();
     void startSelection(const Event *event=NULL);

src/network/servers_manager.cpp

@@ -148,7 +148,7 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
         {
         }   // prepareOperation
         // --------------------------------------------------------------------
-        virtual void operation()
+        virtual void operation() OVERRIDE
         {
             Network *broadcast = new Network(1, 1, 0, 0);
 

src/states_screens/addons_screen.hpp

@@ -101,7 +101,7 @@ public:
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void beforeAddingWidget() OVERRIDE;
 
-    virtual void onColumnClicked(int columnId);
+    virtual void onColumnClicked(int columnId) OVERRIDE;
 
     virtual void init() OVERRIDE;
     virtual void tearDown() OVERRIDE;

src/states_screens/credits.hpp

@@ -84,7 +84,7 @@ public:
 
     void setVictoryMusic(bool isVictory) { m_is_victory_music = isVictory; }
 
-    virtual MusicInformation* getMusic() const
+    virtual MusicInformation* getMusic() const OVERRIDE
     {
         if (m_is_victory_music)
             return music_manager->getMusicInformation("win_theme.music");

src/states_screens/cutscene_gui.hpp

@@ -52,8 +52,8 @@ public:
     void setFadeLevel(float level) { m_fade_level = level; }
     void setSubtitle(const core::stringw& subtitle) { m_subtitle = subtitle; }
 
-    virtual void renderGlobal(float dt);
-    virtual void renderPlayerView(const Camera *camera, float dt){}
+    virtual void renderGlobal(float dt) OVERRIDE;
+    virtual void renderPlayerView(const Camera *camera, float dt) OVERRIDE {}
 
     virtual const core::dimension2du getMiniMapSize() const OVERRIDE
     {

src/states_screens/dialogs/addons_loading.hpp

@@ -59,15 +59,15 @@ public:
 
    ~AddonsLoading();
 
-    virtual GUIEngine::EventPropagation processEvent(const std::string& event_source);
-    virtual void beforeAddingWidgets();
-    virtual void init();
+    virtual GUIEngine::EventPropagation processEvent(const std::string& event_source) OVERRIDE;
+    virtual void beforeAddingWidgets() OVERRIDE;
+    virtual void init() OVERRIDE;
     
     /** This function is called by the GUI, all the frame (or somthing like
      * that). It checks the flags (m_can_load_icon and
      *  and do the necessary.
      * */
-    void onUpdate(float delta);
+    void onUpdate(float delta) OVERRIDE;
     void voteClicked();
     virtual bool onEscapePressed() OVERRIDE;
     

src/states_screens/dialogs/confirm_resolution_dialog.hpp

@@ -38,10 +38,10 @@ private:
 public:
 
     ConfirmResolutionDialog();
-    void onEnterPressedInternal();
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    void onEnterPressedInternal() OVERRIDE;
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource) OVERRIDE;
     
-    virtual void onUpdate(float dt);
+    virtual void onUpdate(float dt) OVERRIDE;
     virtual bool onEscapePressed() OVERRIDE;
 };
   

src/states_screens/dialogs/debug_slider.hpp

@@ -49,7 +49,7 @@ public:
     virtual void onEnterPressedInternal() OVERRIDE;
     virtual void onUpdate(float dt) OVERRIDE;
 
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource) OVERRIDE;
 };
 
 

src/states_screens/dialogs/message_dialog.hpp

@@ -20,6 +20,7 @@
 #define HEADER_CONFIRM_DIALOG_HPP
 
 #include "guiengine/modaldialog.hpp"
+#include "utils/cpp2011.hpp"
 #include "utils/leak_check.hpp"
 
 /**
@@ -93,13 +94,13 @@ public:
     
     ~MessageDialog();
     
-    virtual void onEnterPressedInternal();
-    virtual void onUpdate(float dt);
-    virtual void load();
+    virtual void onEnterPressedInternal() OVERRIDE;
+    virtual void onUpdate(float dt) OVERRIDE;
+    virtual void load() OVERRIDE;
 
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource) OVERRIDE;
 
-    virtual void loadedFromFile();
+    virtual void loadedFromFile() OVERRIDE;
 };
 
 

src/states_screens/dialogs/scripting_console.hpp

@@ -45,7 +45,7 @@ public:
 
     virtual void onEnterPressedInternal() OVERRIDE{ runScript(); }
     void runScript();
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource) OVERRIDE;
 };
 
 #endif

src/states_screens/dialogs/tutorial_message_dialog.hpp

@@ -44,7 +44,7 @@ public:
     virtual void onUpdate(float dt) OVERRIDE;
 
     
-    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource) OVERRIDE;
 };
 
 

src/states_screens/edit_gp_screen.hpp

@@ -43,8 +43,8 @@ class EditGPScreen :
 
          EditGPScreen();
 
-    void onConfirm();
-    void onCancel();
+    void onConfirm() OVERRIDE;
+    void onCancel() OVERRIDE;
 
     void loadList(const int selected);
     void setModified(const bool modified);

src/states_screens/gp_info_screen.hpp

@@ -88,12 +88,12 @@ public:
 
     void onEnterPressedInternal();
     virtual void eventCallback(GUIEngine::Widget *, const std::string &name,
-                               const int player_id);
+                               const int player_id) OVERRIDE;
     virtual void loadedFromFile() OVERRIDE;
     virtual void init() OVERRIDE;
     virtual void beforeAddingWidget() OVERRIDE;
 
-    virtual void onUpdate(float dt);
+    virtual void onUpdate(float dt) OVERRIDE;
 
     void setGP(const std::string &gp_ident);
 };   // GPInfoScreen

src/states_screens/grand_prix_cutscene.hpp

@@ -35,7 +35,7 @@ protected:
     void saveGPButton();
 
     /** implement callback from INewGPListener */
-    void onNewGPWithName(const irr::core::stringw& name);
+    void onNewGPWithName(const irr::core::stringw& name) OVERRIDE;
 
     // implement callbacks from parent class GUIEngine::Screen
     void eventCallback(GUIEngine::Widget* widget,

src/states_screens/grand_prix_editor_screen.hpp

@@ -48,8 +48,8 @@ class GrandPrixEditorScreen :
     void showEditScreen(GrandPrixData* gp);
     void enableButtons();
 
-    void onNewGPWithName(const irr::core::stringw& newName);
-    void onConfirm();
+    void onNewGPWithName(const irr::core::stringw& newName) OVERRIDE;
+    void onConfirm() OVERRIDE;
 
     static const core::stringw getGroupName(enum GrandPrixData::GPGroupType group);
 

src/states_screens/network_kart_selection.hpp

@@ -32,7 +32,7 @@ protected:
     NetworkKartSelectionScreen();
     virtual ~NetworkKartSelectionScreen();
 
-    virtual void playerConfirm(const int playerID);
+    virtual void playerConfirm(const int playerID) OVERRIDE;
 public:
     virtual void init() OVERRIDE;
     virtual bool onEscapePressed() OVERRIDE;

src/states_screens/online_profile_friends.hpp

@@ -72,7 +72,7 @@ public:
 
     virtual void onUpdate(float delta) OVERRIDE;
     virtual void beforeAddingWidget() OVERRIDE;
-    virtual void onColumnClicked(int columnId);
+    virtual void onColumnClicked(int columnId) OVERRIDE;
 
     // ------------------------------------------------------------------------
     /** Triggers a reload of the friend list next time this menu is shown. */

src/states_screens/race_result_gui.hpp

@@ -200,10 +200,10 @@ private:
 public:
 
                  RaceResultGUI();
-    virtual void renderGlobal(float dt);
+    virtual void renderGlobal(float dt) OVERRIDE;
 
     /** \brief Implement callback from parent class GUIEngine::Screen */
-    virtual void loadedFromFile() {};
+    virtual void loadedFromFile() OVERRIDE {};
 
     virtual void init() OVERRIDE;
     virtual void tearDown() OVERRIDE;
@@ -218,11 +218,11 @@ public:
     friend class GUIEngine::ScreenSingleton<RaceResultGUI>;
 
     /** Should not be called anymore.  */
-    const core::dimension2du getMiniMapSize() const
+    const core::dimension2du getMiniMapSize() const OVERRIDE
                   { assert(false); return core::dimension2du(0, 0); }
 
     /** No kart specific view needs to be rendered in the result gui. */
-    virtual void renderPlayerView(const Camera *camera, float dt) {}
+    virtual void renderPlayerView(const Camera *camera, float dt) OVERRIDE {}
 
     virtual void onUpdate(float dt) OVERRIDE;
 
@@ -236,7 +236,7 @@ public:
                             const video::SColor &color=
                                 video::SColor(255, 255, 0, 255),
                             bool important=true,
-                            bool big_font=false) { }
+                            bool big_font=false) OVERRIDE { }
 
     void nextPhase();
 
@@ -252,7 +252,7 @@ public:
       */
     void setHighscore(int rank);
 
-    virtual void onConfirm();
+    virtual void onConfirm() OVERRIDE;
 };   // RaceResultGUI
 
 #endif

src/states_screens/register_screen.hpp

@@ -40,7 +40,7 @@ private:
     void makeEntryFieldsVisible();
     void handleLocalName(const irr::core::stringw &local_name);
     void doRegister();
-    void init();
+    void init() OVERRIDE;
     RegisterScreen();
 
     /** Save the pointer to the info widget, it is widely used. */
@@ -81,7 +81,7 @@ public:
     virtual void onDialogClose() OVERRIDE;
     virtual void onFocusChanged(GUIEngine::Widget *previous, 
                                 GUIEngine::Widget *focus,
-                                int playerID);
+                                int playerID) OVERRIDE;
     void setRename(PlayerProfile *player);
 
     void acceptTerms();

src/states_screens/server_selection.hpp

@@ -67,7 +67,7 @@ public:
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void beforeAddingWidget() OVERRIDE;
 
-    virtual void onColumnClicked(int columnId);
+    virtual void onColumnClicked(int columnId) OVERRIDE;
 
     virtual void init() OVERRIDE;
 

src/states_screens/user_screen.hpp

@@ -103,20 +103,20 @@ private:
 
 public:
     /** \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 eventCallback(GUIEngine::Widget* widget,
-                               const std::string& name, const int playerID);
+                               const std::string& name, const int playerID) OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void init();
+    virtual void init() OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void tearDown();
+    virtual void tearDown() OVERRIDE;
 
     /** \brief implement optional callback from parent class GUIEngine::Screen */
-    virtual void unloaded();
+    virtual void unloaded() OVERRIDE;
 
     void setNewAccountData(bool online, bool auto_login,
                            const core::stringw &online_name="",
@@ -149,9 +149,9 @@ private:
 public:
     friend class GUIEngine::ScreenSingleton<TabbedUserScreen>;
 
-    virtual void init();
+    virtual void init() OVERRIDE;
     virtual void eventCallback(GUIEngine::Widget* widget,
-                               const std::string& name, const int playerID);
+                               const std::string& name, const int playerID) OVERRIDE;
 };   // class TabbedUserScreen
 
 #endif

src/tracks/check_goal.hpp

@@ -51,7 +51,7 @@ public:
              CheckGoal(const XMLNode &node, unsigned int index);
     virtual ~CheckGoal() {}
     virtual void update(float dt) OVERRIDE;
-    virtual void trigger(unsigned int kart_index);
+    virtual void trigger(unsigned int kart_index) OVERRIDE;
     virtual bool isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
                              unsigned int indx) OVERRIDE;
     virtual void reset(const Track &track) OVERRIDE;