mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 08:39:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2551 from Capostrophic/onpcequip

Browse source 
Set OnPCEquip properly when a race can't equip an item (bug #5182)
This commit is contained in:
Andrei Kortunov 2019-10-11 20:07:35 +04:00 committed by GitHub
commit 19e9ece291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -160,6 +160,7 @@
Bug #5169: Nested levelled items/creatures have significantly higher chance not to spawn Bug #5169: Nested levelled items/creatures have significantly higher chance not to spawn
Bug #5175: Random script function returns an integer value Bug #5175: Random script function returns an integer value
Bug #5177: Editor: Unexplored map tiles get corrupted after a file with terrain is saved Bug #5177: Editor: Unexplored map tiles get corrupted after a file with terrain is saved
Bug #5182: OnPCEquip doesn't trigger on skipped beast race attempts to equip something not equippable by beasts
Feature #1774: Handle AvoidNode Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls Feature #3025: Analogue gamepad movement controls

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

@ -526,7 +526,11 @@ namespace MWGui
if (canEquip.first == 0) if (canEquip.first == 0)
{ {
MWBase::Environment::get().getWindowManager()->messageBox(canEquip.second); /// If PCSkipEquip is set, set OnPCEquip to 1 and don't message anything
if (!script.empty() && ptr.getRefData().getLocals().getIntVar(script, "pcskipequip") == 1)
ptr.getRefData().getLocals().setVarByInt(script, "onpcequip", 1);
else
MWBase::Environment::get().getWindowManager()->messageBox(canEquip.second);
updateItemView(); updateItemView();
return; return;
} }