From 715aa80cf2da39c74d4066438a9be09696d35a7d Mon Sep 17 00:00:00 2001 From: LordMisfit Date: Tue, 20 Sep 2016 14:32:40 -0400 Subject: [PATCH] - Fix for DamageFactor bug w/ PowerDamage & PowerProtection --- src/g_shared/a_artifacts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_shared/a_artifacts.cpp b/src/g_shared/a_artifacts.cpp index b5ac970ca..72ad84c2d 100644 --- a/src/g_shared/a_artifacts.cpp +++ b/src/g_shared/a_artifacts.cpp @@ -1668,7 +1668,7 @@ void APowerDamage::ModifyDamage(int damage, FName damageType, int &newdamage, bo newdam = damage * 4; } if (Owner != NULL && newdam > damage) S_Sound(Owner, 5, ActiveSound, 1.0f, ATTN_NONE); - newdamage = newdam; + newdamage = damage = newdam; } if (Inventory != NULL) Inventory->ModifyDamage(damage, damageType, newdamage, passive); } @@ -1743,7 +1743,7 @@ void APowerProtection::ModifyDamage(int damage, FName damageType, int &newdamage newdam = damage / 4; } if (Owner != NULL && newdam < damage) S_Sound(Owner, CHAN_AUTO, ActiveSound, 1.0f, ATTN_NONE); - newdamage = newdam; + newdamage = damage = newdam; } if (Inventory != NULL) {