diff options
| author | Andrei Kortunov <andrei.kortunov@yandex.ru> | 2021-12-26 11:10:24 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-26 11:10:24 +0400 |
| commit | bae02d4ffc9731265c2691fdbce6871f12fdfb36 (patch) | |
| tree | 52a5f90ce3e06ed69afcec027b045aa73e9bdc01 | |
| parent | a3d3c29ff9e11446d845ef64834033a124a33527 (diff) | |
| parent | 5b60cb4acdba15ec3dc20dde5890647aa07f1e4d (diff) | |
Merge pull request #3225 from akortunov/mastergh_sync
Do not display effects duration for ingredients
| -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 e4094f0ec2..601bbeaeba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,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); |