mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 02:15:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'ShowSpellMagickaCostInSpellBuyingWindow' into 'master'

Browse source 
Adds requested feature #5147: Show spell magicka cost in spell buying window

See merge request OpenMW/openmw!144
This commit is contained in:
Andrei Kortunov 2019-09-02 17:18:56 +00:00
commit 0caf192212
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -179,6 +179,7 @@
Feature #5131: Custom skeleton bones
Feature #5132: Unique animations for different weapon types
Feature #5146: Safe Dispose corpse
Feature #5147: Show spell magicka cost in spell buying window
Task #4686: Upgrade media decoder to a more current FFmpeg API
Task #4695: Optimize Distant Terrain memory consumption
Task #4789: Optimize cell transitions

1
apps/openmw/mwgui/spellbuyingwindow.cpp
View file

@ -70,6 +70,7 @@ namespace MWGui
toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel);
toAdd->setUserString("ToolTipType", "Spell");
toAdd->setUserString("Spell", spell.mId);
toAdd->setUserString("SpellCost", std::to_string(spell.mData.mCost));
toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onSpellButtonClick);
mSpellsWidgetMap.insert(std::make_pair (toAdd, spell.mId));
}

3
apps/openmw/mwgui/tooltips.cpp
View file

@ -249,6 +249,9 @@ namespace MWGui
int school = MWMechanics::getSpellSchool(spell, player);
info.text = "#{sSchool}: " + sSchoolNames[school];
}
std::string cost = focus->getUserString("SpellCost");
if (cost != "" && cost != "0")
info.text += MWGui::ToolTips::getValueString(spell->mData.mCost, "#{sCastCost}");
info.effects = effects;
tooltipSize = createToolTip(info);
}