Merge pull request #767 from dolio/fix/racial-saves

Fix double stacking NPC save bonus

TemplePlus/damage.cpp

@@ -73,8 +73,6 @@ static struct DamageAddresses : temple::AddressTable {
 	int (__cdecl*HealSubdual)(objHndl target, int amount);
 
 	int (__cdecl*DoSpellDamage)(objHndl victim, objHndl attacker, uint32_t dmgDice, DamageType type, int attackPowerType, int reduction, int damageDescMesKey, int actionType, int spellId, int flags);
-
-	bool (__cdecl *SavingThrow)(objHndl obj, objHndl attacker, int dc, SavingThrowType type, int flags);
 
 	bool (__cdecl *SavingThrowSpell)(objHndl obj, objHndl attacker, int dc, SavingThrowType type, int flags, int spellId);
 
@@ -110,7 +108,6 @@ static struct DamageAddresses : temple::AddressTable {
 		rebase(HealSpell, 0x100B81D0);
 		rebase(DoSpellDamage, 0x100B7F80);
 		rebase(HealSubdual, 0x100B9030);
-		rebase(SavingThrow, 0x100B4F20);
 		rebase(SavingThrowSpell, 0x100B83C0);
 		rebase(ReflexSaveAndDamage, 0x100B9500);
 
@@ -161,6 +158,10 @@ class DamageHooks: TempleFix
 		replaceFunction<int(__cdecl)(objHndl, objHndl, int, D20CAF, D20ActionType)>(0x100B7950, [](objHndl attacker, objHndl tgt, int d20Data, D20CAF flags, D20ActionType actionType) {
 			return damage.DealAttackDamage(attacker, tgt, d20Data, flags, actionType);
 		});
+
+		replaceFunction<bool(__cdecl)(objHndl, objHndl, int, int, int)>(0x100B4F20, [](objHndl tgt, objHndl atk, int dc, int saveType, int flags) {
+			return damage.SavingThrow(tgt, atk, dc, static_cast<SavingThrowType>(saveType), flags);
+		});
 	}
 } damageHooks;
 
@@ -891,8 +892,6 @@ bool Damage::SavingThrow(objHndl handle, objHndl attacker, int dc, SavingThrowTy
 			return false; // natural 1 - always fails
 	}
 	return saveThrowMod + diceResult >= dc;
-
-	// return addresses.SavingThrow(handle, attacker, dc, saveType, flags);
 }
 
 bool Damage::SavingThrowSpell(objHndl obj, objHndl attacker, int dc, SavingThrowType type, int flags, int spellId) {