mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-28 21:07:59 +03:00
Merge branch 'RecalcSpellBuyCost' into 'master'
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Build and test / MacOS (push) Waiting to run
Build and test / Read .env file and expose it as output (push) Waiting to run
Build and test / Windows (2019) (push) Blocked by required conditions
Build and test / Windows (2022) (push) Blocked by required conditions
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Build and test / MacOS (push) Waiting to run
Build and test / Read .env file and expose it as output (push) Waiting to run
Build and test / Windows (2019) (push) Blocked by required conditions
Build and test / Windows (2022) (push) Blocked by required conditions
Calculate spell cost when building spell-buying window Closes #8459 See merge request OpenMW/openmw!4640
This commit is contained in:
commit
c3ca15aabb
1 changed files with 3 additions and 2 deletions
|
@ -19,6 +19,7 @@
|
|||
#include "../mwmechanics/actorutil.hpp"
|
||||
#include "../mwmechanics/creaturestats.hpp"
|
||||
#include "../mwmechanics/spells.hpp"
|
||||
#include "../mwmechanics/spellutil.hpp"
|
||||
|
||||
namespace MWGui
|
||||
{
|
||||
|
@ -43,8 +44,8 @@ namespace MWGui
|
|||
const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
|
||||
|
||||
int price = std::max(1,
|
||||
static_cast<int>(
|
||||
spell.mData.mCost * store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat()));
|
||||
static_cast<int>(MWMechanics::calcSpellCost(spell)
|
||||
* store.get<ESM::GameSetting>().find("fSpellValueMult")->mValue.getFloat()));
|
||||
price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true);
|
||||
|
||||
MWWorld::Ptr player = MWMechanics::getPlayer();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue