Remove some unused code

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 2e100f2ce10fb25b044d9f6afbcc2e66908d7574..56cac627f5c7e7be76a72e57567f663fc005b7b3 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -552,10 +552,7 @@ void Ice_Think()
 
 void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint)
 {
-       float monster = (targ.flags & FL_MONSTER);
-       float player = (targ.flags & FL_CLIENT);
-       
-       if(!player && !monster) // only specified entities can be freezed
+       if(!IS_PLAYER(targ) && !(targ.flags & FL_MONSTER)) // only specified entities can be freezed
                return;
                
        if(targ.frozen)
@@ -595,18 +592,19 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 
 void Unfreeze (entity targ)
 {
-       if not(targ.frozen)
-               return; // not even frozen?
-               
+       if(targ.frozen) // only reset health if target was frozen
+               targ.health = ((IS_PLAYER(targ)) ? autocvar_g_balance_health_start : targ.max_health);
        targ.frozen = 0;
        targ.revive_progress = 0;
-       targ.health = ((targ.classname == STR_PLAYER) ? autocvar_g_balance_health_start : targ.max_health);
        
        WaypointSprite_Kill(targ.waypointsprite_attached);
 
        // remove the ice block
-       remove(targ.iceblock);
-       targ.iceblock = world;
+       if(targ.iceblock)
+       {
+               remove(targ.iceblock);
+               targ.iceblock = world;
+       }
 }
 
 // these are updated by each Damage call for use in button triggering and such