diff options
| author | Evil Eye <malusluminis@hotmail.com> | 2021-12-26 19:50:20 +0000 |
|---|---|---|
| committer | Evil Eye <malusluminis@hotmail.com> | 2021-12-26 19:50:20 +0000 |
| commit | c166341ec07de023b42468edd36941f394cf07bf (patch) | |
| tree | 7ca1b4ee055a10a5af71e8a7fe3950c7b40fd0f7 | |
| parent | 01ac96e900d72165df193184a2d887d8fd4062cc (diff) | |
| parent | 81c9ef947ff8c5309d3b4366f6a4beaac34eb81d (diff) | |
Merge branch 'gh_sync' into 'master'
Resovles #6519 Do not display effects duration for ingredient
See merge request OpenMW/openmw!1506
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | apps/openmw/mwgui/tooltips.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 78abf58a1c..d239717d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,6 +93,7 @@ Bug #6473: Strings from NIF should be parsed only to first null terminator Bug #6493: Unlocking owned but not locked or unlocked containers is considered a crime Bug #6517: Rotations for KeyframeData in NIFs should be optional + Bug #6519: Effects tooltips for ingredients work incorrectly Feature #890: OpenMW-CS: Column filtering Feature #1465: "Reset" argument for AI functions Feature #2554: Modifying an object triggers the instances table to scroll to the corresponding record diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index 84d8b65592..0a2fd4c448 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/apps/openmw/mwgui/tooltips.cpp @@ -493,6 +493,7 @@ namespace MWGui std::vector<MyGUI::Widget*> effectItems; int flag = info.isPotion ? Widgets::MWEffectList::EF_NoTarget : 0; flag |= info.isIngredient ? Widgets::MWEffectList::EF_NoMagnitude : 0; + flag |= info.isIngredient ? Widgets::MWEffectList::EF_Constant : 0; effectsWidget->createEffectWidgets(effectItems, effectArea, coord, true, flag); totalSize.height += coord.top-6; totalSize.width = std::max(totalSize.width, coord.width); |