From 8473336b06e9128db266c30c26999e2d97fe1d16 Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 6 May 2022 19:56:10 +0200 Subject: [PATCH] Remove redundant virtual functions --- apps/openmw/mwbase/statemanager.hpp | 2 -- apps/openmw/mwbase/windowmanager.hpp | 2 -- apps/openmw/mwbase/world.hpp | 1 - apps/openmw/mwgui/windowmanagerimp.hpp | 2 +- apps/openmw/mwstate/statemanagerimp.hpp | 2 +- apps/openmw/mwworld/worldimp.hpp | 2 +- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp index 0537ff02d2..c18db4190d 100644 --- a/apps/openmw/mwbase/statemanager.hpp +++ b/apps/openmw/mwbase/statemanager.hpp @@ -53,8 +53,6 @@ namespace MWBase /// /// \param bypass Skip new game mechanics. - virtual void endGame() = 0; - virtual void resumeGame() = 0; virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot) = 0; diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp index 45ea43daa8..b0076b02f2 100644 --- a/apps/openmw/mwbase/windowmanager.hpp +++ b/apps/openmw/mwbase/windowmanager.hpp @@ -282,8 +282,6 @@ namespace MWBase /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this. virtual void setKeyFocusWidget (MyGUI::Widget* widget) = 0; - virtual void loadUserFonts() = 0; - virtual Loading::Listener* getLoadingScreen() = 0; /// Should the cursor be visible? diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index 899be7dfb9..4aaf84c126 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -623,7 +623,6 @@ namespace MWBase virtual bool isPlayerInJail() const = 0; virtual void rest(double hours) = 0; - virtual void rechargeItems(double duration, bool activeOnly) = 0; virtual void setPlayerTraveling(bool traveling) = 0; virtual bool isPlayerTraveling() const = 0; diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index 9a7ea2f1a7..9a4de2b33f 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -142,7 +142,7 @@ namespace MWGui void setStore (const MWWorld::ESMStore& store); void initUI(); - void loadUserFonts() override; + void loadUserFonts(); Loading::Listener* getLoadingScreen() override; diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp index 273a3eb3bc..3da71e8401 100644 --- a/apps/openmw/mwstate/statemanagerimp.hpp +++ b/apps/openmw/mwstate/statemanagerimp.hpp @@ -46,7 +46,7 @@ namespace MWState /// /// \param bypass Skip new game mechanics. - void endGame() override; + void endGame(); void resumeGame() override; diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index 09bae6653d..d5ff82f52d 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -587,7 +587,7 @@ namespace MWWorld ///< check if the player is allowed to rest void rest(double hours) override; - void rechargeItems(double duration, bool activeOnly) override; + void rechargeItems(double duration, bool activeOnly); /// \todo Probably shouldn't be here MWRender::Animation* getAnimation(const MWWorld::Ptr &ptr) override;