]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
stop fire when frozen (freezetag)
authorRudolf Polzer <divverent@alientrap.org>
Wed, 12 Jan 2011 20:43:09 +0000 (21:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 12 Jan 2011 20:43:09 +0000 (21:43 +0100)
qcsrc/server/g_damage.qc

index 357f5191ec8355c9d22533f016a53a45191e372a..69f5bfa2488620d9c93e23810f52b3ce1495b2e5 100644 (file)
@@ -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;