mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-17 20:42:29 +00:00
Code Issues Projects Releases Wiki Activity

Initialize variables on declaration

Browse Source
This commit is contained in:
elsid 2022-07-04 21:38:26 +02:00
parent a05ed48a57
commit f8b8569f3b
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwmechanics/actors.cpp
View File

@ -93,16 +93,18 @@ void adjustCommandedActor (const MWWorld::Ptr& actor)
}); });
} }
void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float& magicka) std::pair<float, float> getRestorationPerHourOfSleep(const MWWorld::Ptr& ptr)
{ {
MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr); MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>(); const MWWorld::Store<ESM::GameSetting>& settings = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified (); float endurance = stats.getAttribute (ESM::Attribute::Endurance).getModified ();
health = 0.1f * endurance; const float health = 0.1f * endurance;
float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat (); float fRestMagicMult = settings.find("fRestMagicMult")->mValue.getFloat ();
magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified(); const float magicka = fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified();
return {health, magicka};
} }
template<class T> template<class T>
@ -764,8 +766,7 @@ namespace MWMechanics
if (sleep) if (sleep)
{ {
float health, magicka; auto [health, magicka] = getRestorationPerHourOfSleep(ptr);
getRestorationPerHourOfSleep(ptr, health, magicka);
DynamicStat<float> stat = stats.getHealth(); DynamicStat<float> stat = stats.getHealth();
stat.setCurrent(stat.getCurrent() + health * hours); stat.setCurrent(stat.getCurrent() + health * hours);
@ -1908,8 +1909,7 @@ namespace MWMechanics
int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
{ {
float healthPerHour, magickaPerHour; auto [healthPerHour, magickaPerHour] = getRestorationPerHourOfSleep(ptr);
getRestorationPerHourOfSleep(ptr, healthPerHour, magickaPerHour);
CreatureStats& stats = ptr.getClass().getCreatureStats(ptr); CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0; bool stunted = stats.getMagicEffects ().get(ESM::MagicEffect::StuntedMagicka).getMagnitude() > 0;