mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:23:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'patch-1' into 'master'

Browse source 
Make sure the player cannot use quickkeys while disableplayerfighting or disableplayermagic is active

See merge request OpenMW/openmw!92
This commit is contained in:
Alexei Dobrohotov 2019-04-12 13:08:55 +00:00
commit 01d725d2d1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -60,6 +60,7 @@
Bug #4963: Enchant skill progress is incorrect
Bug #4965: Global light attenuation settings setup is lacking
Bug #4969: "Miss" sound plays for any actor
Bug #4972: Player is able to use quickkeys while disableplayerfighting is active
Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file
Feature #3610: Option to invert X axis

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

@ -1333,7 +1333,7 @@ namespace MWInput
void InputManager::quickKey (int index)
{
if (!mControlSwitch["playercontrols"])
if (!mControlSwitch["playercontrols"] || !mControlSwitch["playerfighting"] || !mControlSwitch["playermagic"])
return;
if (!checkAllowedToUseItems())
return;