Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'RecalcSpellBuyCost' into 'master'
Some checks failed
Build and test / Ubuntu (push) Has been cancelled
Details
Build and test / MacOS (push) Has been cancelled
Details
Build and test / Read .env file and expose it as output (push) Has been cancelled
Details
Build and test / Windows (2019) (push) Has been cancelled
Details
Build and test / Windows (2022) (push) Has been cancelled
Details

Browse source 
Calculate spell cost when building spell-buying window

Closes #8459

See merge request OpenMW/openmw!4640
This commit is contained in:
Aussiemon 2025-04-25 12:42:16 -06:00
commit 2c9c54ccac
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/spells.hpp" #include "../mwmechanics/spells.hpp"
#include "../mwmechanics/spellutil.hpp"
namespace MWGui namespace MWGui
{ {
@ -43,8 +44,8 @@ namespace MWGui
const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore(); const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
int price = std::max(1, int price = std::max(1,
static_cast<int>( static_cast<int>(MWMechanics::calcSpellCost(spell)
spell.mData.mCost * store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat())); * store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat()));
price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true); price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
MWWorld::Ptr player = MWMechanics::getPlayer(); MWWorld::Ptr player = MWMechanics::getPlayer();