From: FruitieX <fruitiex@gmail.com>
Date: Tue, 30 Nov 2010 16:28:14 +0000 (+0200)
Subject: freezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case
X-Git-Tag: xonotic-v0.1.0preview~86^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=691c88bee22b5240b9589c245a946a3a90217d2b;p=xonotic%2Fxonotic-data.pk3dir.git

freezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index b8c6d4cf0..fd5b445eb 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -631,6 +631,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		frag_target = targ;
 		frag_damage = damage;
 		frag_force = force;
+        frag_deathtype = deathtype;
 		MUTATOR_CALLHOOK(PlayerDamage_Calculate);
 		damage = frag_damage;
 		force = frag_force;
diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh
index 974e1a4c5..1780da90a 100644
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@ -136,6 +136,7 @@ MUTATOR_HOOKABLE(PlayerDamage_Calculate);
 	// INPUT:
 		entity frag_attacker;
 		entity frag_target;
+		float frag_damage;
 	// INPUT, OUTPUT:
 		float frag_damage;
 		vector frag_force;
@@ -144,4 +145,4 @@ MUTATOR_HOOKABLE(PlayerPowerups);
 	// called at the end of player_powerups() in cl_client.qc, used for manipulating the values which are set by powerup items.
 	// INPUT
 	entity self;
-	float olditems; // also technically output, but since it is at the end of the function it's useless for that :P 
\ No newline at end of file
+	float olditems; // also technically output, but since it is at the end of the function it's useless for that :P 
diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index f07c30ef5..790c9d042 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -261,7 +261,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate)
 {
     if(g_freezetag)
     {
-        if(frag_target.freezetag_frozen == 1)
+        if(frag_target.freezetag_frozen == 1 && frag_deathtype != DEATH_HURTTRIGGER)
         {
             frag_damage = 0;
             frag_force = frag_force * cvar("g_freezetag_frozen_force");