teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Minor cleanup

Browse source
This commit is contained in:
scrawl 2013-06-13 12:13:40 +02:00
parent fcf35d3871
commit 0880805559
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -13,12 +13,6 @@
#include <extern/sdl4ogre/sdlcursormanager.hpp> #include <extern/sdl4ogre/sdlcursormanager.hpp>
#include <components/settings/settings.hpp>
#include <components/translation/translation.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "../mwbase/inputmanager.hpp" #include "../mwbase/inputmanager.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"

4
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -562,9 +562,7 @@ namespace MWInput
if (MyGUI::InputManager::getInstance ().isModalAny()) if (MyGUI::InputManager::getInstance ().isModalAny())
return; return;
if (mWindows.isGuiMode () && (mWindows.getMode () == MWGui::GM_MainMenu || mWindows.getMode () == MWGui::GM_Settings)) if (mWindows.isGuiMode () && mWindows.getMode () == MWGui::GM_Video)
mWindows.popGuiMode();
else if (mWindows.isGuiMode () && mWindows.getMode () == MWGui::GM_Video)
MWBase::Environment::get().getWorld ()->stopVideo (); MWBase::Environment::get().getWorld ()->stopVideo ();
else if (mWindows.containsMode(MWGui::GM_MainMenu)) else if (mWindows.containsMode(MWGui::GM_MainMenu))
mWindows.popGuiMode(); mWindows.popGuiMode();