mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'potatoesmaster/bug-839'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-08-06 17:39:29 +02:00
commit 03af7175dd
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -643,6 +643,10 @@ namespace MWInput
{ {
if (mWindows.isGuiMode()) return; if (mWindows.isGuiMode()) return;
// Not allowed before the magic window is accessible
if (!mWindows.isAllowed(MWGui::GW_Magic))
return;
MWMechanics::DrawState_ state = mPlayer.getDrawState(); MWMechanics::DrawState_ state = mPlayer.getDrawState();
if (state == MWMechanics::DrawState_Weapon || state == MWMechanics::DrawState_Nothing) if (state == MWMechanics::DrawState_Weapon || state == MWMechanics::DrawState_Nothing)
mPlayer.setDrawState(MWMechanics::DrawState_Spell); mPlayer.setDrawState(MWMechanics::DrawState_Spell);
@ -654,6 +658,10 @@ namespace MWInput
{ {
if (mWindows.isGuiMode()) return; if (mWindows.isGuiMode()) return;
// Not allowed before the inventory window is accessible
if (!mWindows.isAllowed(MWGui::GW_Inventory))
return;
MWMechanics::DrawState_ state = mPlayer.getDrawState(); MWMechanics::DrawState_ state = mPlayer.getDrawState();
if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing) if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing)
mPlayer.setDrawState(MWMechanics::DrawState_Weapon); mPlayer.setDrawState(MWMechanics::DrawState_Weapon);