mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-26 23:40:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'drainfatigue' into 'master'

Browse source 
Uncap Drain Fatigue again (bug #7573)

Closes #7573

See merge request OpenMW/openmw!3414
This commit is contained in:
psi29a 2023-09-11 06:57:25 +00:00
commit d87db1dc5f
No known key found for this signature in database
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -71,6 +71,7 @@
Bug #7505: Distant terrain does not support sample size greater than cell size Bug #7505: Distant terrain does not support sample size greater than cell size
Bug #7553: Faction reaction loading is incorrect Bug #7553: Faction reaction loading is incorrect
Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading
Bug #7573: Drain Fatigue can't bring fatigue below zero by default
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples
Feature #5492: Let rain and snow collide with statics Feature #5492: Let rain and snow collide with statics
Feature #6149: Dehardcode Lua API_REVISION Feature #6149: Dehardcode Lua API_REVISION

4
apps/openmw/mwmechanics/spelleffects.cpp
View file

@ -717,8 +717,8 @@ namespace MWMechanics
if (!godmode) if (!godmode)
{ {
int index = effect.mEffectId - ESM::MagicEffect::DrainHealth; int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
adjustDynamicStat( // Unlike Absorb and Damage effects Drain effects can bring stats below zero
target, index, -effect.mMagnitude, Settings::game().mUncappedDamageFatigue && index == 2); adjustDynamicStat(target, index, -effect.mMagnitude, true);
if (index == 0) if (index == 0)
receivedMagicDamage = affectedHealth = true; receivedMagicDamage = affectedHealth = true;
} }