From: Mario <mario.mario@y7mail.com>
Date: Wed, 20 May 2020 10:55:15 +0000 (+1000)
Subject: Fix nades not interacting properly with the overkill shotgun
X-Git-Tag: xonotic-v0.8.5~1057
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c935c916af5069f7b5ff52f95a17f2bb680e83f9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix nades not interacting properly with the overkill shotgun
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 510fcf92e..0a482095d 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -892,7 +892,7 @@ void nade_damage(entity this, entity inflictor, entity attacker, float damage, i
 	}
 	else if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN) || DEATH_ISWEAPON(deathtype, WEP_OVERKILL_MACHINEGUN))
 		damage = this.max_health * 0.1;
-	else if(DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN)) // WEAPONTODO
+	else if(DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN) || DEATH_ISWEAPON(deathtype, WEP_OVERKILL_SHOTGUN)) // WEAPONTODO
 	{
 		if(!(deathtype & HITTYPE_SECONDARY))
 			damage = this.max_health * 1.15;