Made trigger_hurt strip invulnerability

KovaaK · Sep 24, 2023 · 51d9395 · 51d9395
1 parent bbf9786
commit 51d9395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/combat.c b/src/combat.c
@@ -453,7 +453,6 @@ void T_Damage(gedict_t *targ, gedict_t *inflictor, gedict_t *attacker, float dam
 	// can't apply damage to dead
 	if (!targ->s.v.takedamage || ISDEAD(targ))
 	{
-		if (!(cvar("k_smashmode") && isRA() && dtTRIGGER_HURT == targ->deathtype))
 			return;
 	}
 

diff --git a/src/triggers.c b/src/triggers.c
@@ -954,6 +954,9 @@ void hurt_items()
 
 void hurt_touch()
 {
+	if (isRA() && ra_match_fight != 2 && cvar("k_smashmode") && streq(other->classname, "player"))
+		other->s.v.takedamage = DAMAGE_AIM;
+
 	if (!other->s.v.takedamage)
 	{
 		hurt_items();