X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=c7a6f2cfb3b179d1452e9f0e88300192f61d722e;hp=33dd8b2e25d1e21ed7108a416c10bbeb5d395d2c;hb=109c961b4eacb3f617d9c66f9fdec40e1264f97e;hpb=26d2cece1d88a2fad9e0a2f8069c3924496698c1 diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 33dd8b2e2..c7a6f2cfb 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -518,7 +518,7 @@ void Ice_Think(entity this) this.nextthink = time; } -void Freeze(entity targ, float freeze_time, float frozen_type, float show_waypoint) +void Freeze (entity targ, float revivespeed, float frozen_type, float show_waypoint) { if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed return; @@ -531,10 +531,11 @@ void Freeze(entity targ, float freeze_time, float frozen_type, float show_waypoi STAT(FROZEN, targ) = frozen_type; STAT(REVIVE_PROGRESS, targ) = ((frozen_type == 3) ? 1 : 0); SetResourceAmount(targ, RESOURCE_HEALTH, ((frozen_type == 3) ? targ_maxhealth : 1)); - targ.revive_speed = freeze_time; + targ.revive_speed = revivespeed; if(targ.bot_attack) IL_REMOVE(g_bot_targets, targ); targ.bot_attack = false; + targ.freeze_time = time; entity ice = new(ice); ice.owner = targ;