mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 10:06:42 +00:00
Code Issues Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2013-09-23 15:34:52 +02:00
parent 91d7291c0c
commit 0f1c4cb00e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/mainmenu.cpp
View file

@ -71,7 +71,7 @@ namespace MWGui
MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f); MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f);
if (sender == mButtons["return"]) if (sender == mButtons["return"])
{ {
MWBase::Environment::get().getSoundManager ()->resumeSounds(MWBase::Environment::get().getSoundManager ()-> Play_TypeSfx); MWBase::Environment::get().getSoundManager ()->resumeSounds (MWBase::SoundManager::Play_TypeSfx);
MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu); MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu);
} }
else if (sender == mButtons["options"]) else if (sender == mButtons["options"])

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

@ -577,8 +577,8 @@ namespace MWInput
rot[0] = -y; rot[0] = -y;
rot[1] = 0.0f; rot[1] = 0.0f;
rot[2] = x; rot[2] = x;
// Only actually turn player when we're not in vanity mode // Only actually turn player when we're not in vanity mode
if(!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot)) if(!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot))
{ {
mPlayer->yaw(x/scale); mPlayer->yaw(x/scale);
@ -619,12 +619,12 @@ namespace MWInput
else if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu)) else if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu))
{ {
MWBase::Environment::get().getWindowManager()->popGuiMode(); MWBase::Environment::get().getWindowManager()->popGuiMode();
MWBase::Environment::get().getSoundManager()->resumeSounds(MWBase::Environment::get().getSoundManager()->Play_TypeSfx); MWBase::Environment::get().getSoundManager()->resumeSounds (MWBase::SoundManager::Play_TypeSfx);
} }
else else
{ {
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu); MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
MWBase::Environment::get().getSoundManager()->pauseSounds(MWBase::Environment::get().getSoundManager()->Play_TypeSfx); MWBase::Environment::get().getSoundManager()->pauseSounds (MWBase::SoundManager::Play_TypeSfx);
} }
} }