mirror of
https://github.com/OpenMW/openmw.git
synced 2025-05-12 17:41:27 +00:00
Merge branch 'flip_sign' into 'master'
Fix regression #6328 Closes #6328 See merge request OpenMW/openmw!1267
This commit is contained in:
commit
9c47fdcf7e
1 changed files with 4 additions and 4 deletions
|
@ -63,9 +63,9 @@ namespace
|
||||||
auto& creatureStats = target.getClass().getCreatureStats(target);
|
auto& creatureStats = target.getClass().getCreatureStats(target);
|
||||||
auto stat = creatureStats.getDynamic(index);
|
auto stat = creatureStats.getDynamic(index);
|
||||||
float current = stat.getCurrent();
|
float current = stat.getCurrent();
|
||||||
stat.setModified(stat.getModified() - magnitude, 0);
|
stat.setModified(stat.getModified() + magnitude, 0);
|
||||||
stat.setCurrentModified(stat.getCurrentModified() - magnitude);
|
stat.setCurrentModified(stat.getCurrentModified() + magnitude);
|
||||||
stat.setCurrent(current - magnitude);
|
stat.setCurrent(current + magnitude);
|
||||||
creatureStats.setDynamic(index, stat);
|
creatureStats.setDynamic(index, stat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -488,7 +488,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
|
||||||
index = 2;
|
index = 2;
|
||||||
// Damage "Dynamic" abilities reduce the base value
|
// Damage "Dynamic" abilities reduce the base value
|
||||||
if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
|
if(spellParams.getType() == ESM::ActiveSpells::Type_Ability)
|
||||||
modDynamicStat(target, index, effect.mMagnitude);
|
modDynamicStat(target, index, -effect.mMagnitude);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
|
static const bool uncappedDamageFatigue = Settings::Manager::getBool("uncapped damage fatigue", "Game");
|
||||||
|
|
Loading…
Reference in a new issue