Merge branch 'master' into terencehill/bot_fixes

[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 9791bbd2933ceac46d4e54e91fc7f0a6132978ad..45c6ba12540c508ac07f01ed31d19f909e1e9e8c 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -565,6 +565,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
        targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
        targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
        targ.revive_speed = freeze_time;
        targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
        targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
        targ.revive_speed = freeze_time;

+       self.bot_attack = false;

 
        entity ice, head;
        ice = spawn();
 
        entity ice, head;
        ice = spawn();


@@ -600,6 +601,9 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo
 
 void Unfreeze (entity targ)
 {
 
 void Unfreeze (entity targ)
 {

+       if(!targ.frozen)
+               return;
+

        if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen
                targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health);
 
        if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen
                targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health);
 


@@ -607,6 +611,7 @@ void Unfreeze (entity targ)
        targ.frozen = 0;
        targ.revive_progress = 0;
        targ.revival_time = time;
        targ.frozen = 0;
        targ.revive_progress = 0;
        targ.revival_time = time;

+       self.bot_attack = true;

 
        WaypointSprite_Kill(targ.waypointsprite_attached);
 
 
        WaypointSprite_Kill(targ.waypointsprite_attached);