mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 15:15:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4 from scrawl/melee

Browse source 
Fixes weapon input to use A_Use instead of hardcoding to mouse button
This commit is contained in:
gugus 2013-07-16 07:35:21 -07:00
commit 9043fe427f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,6 +161,12 @@ namespace MWInput
resetIdleTime (); resetIdleTime ();
int action = channel->getNumber(); int action = channel->getNumber();
if (action == A_Use)
{
MWWorld::Class::get(mPlayer.getPlayer()).getCreatureStats(mPlayer.getPlayer()).setAttackingOrSpell(currentValue);
}
if (currentValue == 1) if (currentValue == 1)
{ {
// trigger action activated // trigger action activated
@ -522,8 +528,6 @@ namespace MWInput
} }
} }
MWWorld::Class::get(mPlayer.getPlayer()).getCreatureStats(mPlayer.getPlayer()).setAttackingOrSpell(true);
return true; return true;
} }
@ -533,8 +537,6 @@ namespace MWInput
MyGUI::InputManager::getInstance().injectMouseRelease(mMouseX, mMouseY, sdlButtonToMyGUI(id)); MyGUI::InputManager::getInstance().injectMouseRelease(mMouseX, mMouseY, sdlButtonToMyGUI(id));
MWWorld::Class::get(mPlayer.getPlayer()).getCreatureStats(mPlayer.getPlayer()).setAttackingOrSpell(false);
return true; return true;
} }