From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 12 Jan 2011 20:43:09 +0000 (+0100)
Subject: stop fire when frozen (freezetag)
X-Git-Tag: xonotic-v0.5.0~318^2~130
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=653ebdfa113f0961e13219c7b6818d34d81e20b1;p=xonotic%2Fxonotic-data.pk3dir.git

stop fire when frozen (freezetag)
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 357f5191e..69f5bfa24 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1240,6 +1240,10 @@ void Fire_ApplyDamage(entity e)
 	if(e.watertype != CONTENT_LAVA)
 		e.fire_endtime = 0;
 
+	// ice stops fire
+	if(e.freezetag_frozen)
+		e.fire_endtime = 0;
+
 	t = min(frametime, e.fire_endtime - time);
 	d = e.fire_damagepersec * t;