From f986e3fafa63590ff5c4b836b688d336f2c5d45e Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Fri, 21 Apr 2017 18:03:23 +0400 Subject: [PATCH] Remove unused code --- apps/openmw/mwbase/windowmanager.hpp | 1 - apps/openmw/mwgui/windowmanagerimp.cpp | 8 +------- apps/openmw/mwgui/windowmanagerimp.hpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp index 6a159ea7d6..f103ce1914 100644 --- a/apps/openmw/mwbase/windowmanager.hpp +++ b/apps/openmw/mwbase/windowmanager.hpp @@ -104,7 +104,6 @@ namespace MWBase * new dialogs. */ virtual void update() = 0; - virtual void updateVisible() = 0; /// @note This method will block until the video finishes playing /// (and will continually update the window while doing so) diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 08d369250c..e772818981 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -485,6 +485,7 @@ namespace MWGui void WindowManager::update() { cleanupGarbage(); + mHud->update(); } @@ -559,13 +560,6 @@ namespace MWGui return; } - // No need to check GUI if game mode - if (gameMode) - { - mInventoryWindow->setGuiMode(GM_None); - return; - } - if(mGuiModes.size() != 0) { GuiMode mode = mGuiModes.back(); diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index 791ed602ea..1b8ceecc2f 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -361,7 +361,7 @@ namespace MWGui virtual void pinWindow (MWGui::GuiWindow window); - virtual void updatePinnedWindows (); + void updatePinnedWindows (); /// Fade the screen in, over \a time seconds virtual void fadeScreenIn(const float time, bool clearQueue);