Merge branch 'master' into martin-t/dmgtext

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

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index 0af110c9e890f29925db0803eedcd8d29f4eba04..1d100e7a5a86874b2be4ed55771584f708581fd0 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -49,7 +49,7 @@ float damage_gooddamage;
 .float teamkill_soundtime;
 .entity teamkill_soundsource;
 .entity pusher;
-.float istypefrag;
+.bool istypefrag;
 .float taunt_soundtime;
 
 float IsFlying(entity a);
@@ -85,7 +85,7 @@ void Ice_Think(entity this);
 
 void Freeze(entity targ, float freeze_time, int frozen_type, bool show_waypoint);
 
-void Unfreeze (entity targ);
+void Unfreeze(entity targ, bool reset_health);
 
 // NOTE: the .weaponentity parameter can be set to DMG_NOWEP if the attack wasn't caused by a weapon or player
 void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);