Merge branch 'ShowSpellMagickaCostInSpellBuyingWindow' into 'master'

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

See merge request OpenMW/openmw!144
pull/541/head
Andrei Kortunov 5 years ago
commit 0caf192212

@ -179,6 +179,7 @@
Feature #5131: Custom skeleton bones Feature #5131: Custom skeleton bones
Feature #5132: Unique animations for different weapon types Feature #5132: Unique animations for different weapon types
Feature #5146: Safe Dispose corpse 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 #4686: Upgrade media decoder to a more current FFmpeg API
Task #4695: Optimize Distant Terrain memory consumption Task #4695: Optimize Distant Terrain memory consumption
Task #4789: Optimize cell transitions Task #4789: Optimize cell transitions

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

@ -249,6 +249,9 @@ namespace MWGui
int school = MWMechanics::getSpellSchool(spell, player); int school = MWMechanics::getSpellSchool(spell, player);
info.text = "#{sSchool}: " + sSchoolNames[school]; 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; info.effects = effects;
tooltipSize = createToolTip(info); tooltipSize = createToolTip(info);
} }

Loading…
Cancel
Save