X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_freezetag.qc;h=f57661fba9617c1fb2d27683bdeb55e59eebeb4a;hb=0042a63cfa8ef7889d1f9ed24e3644615ffbef2a;hp=bee23d10148ca298da4e52bdab45b95bc0b213c3;hpb=68d68e5cbc145772438bfdd775302b91f442f029;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
index bee23d101..f57661fba 100644
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -16,7 +16,7 @@ REGISTER_MUTATOR(ft, false)
 		freezetag_Initialize();
 
 		ActivateTeamplay();
-		SetLimits(autocvar_g_freezetag_point_limit, autocvar_g_freezetag_point_leadlimit, -1, -1);
+		SetLimits(autocvar_g_freezetag_point_limit, autocvar_g_freezetag_point_leadlimit, autocvar_timelimit_override, -1);
 
 		if (autocvar_g_freezetag_team_spawns)
 			have_team_spawns = -1; // request team spawns
@@ -380,7 +380,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 	if(round_handler_CountdownRunning())
 	{
 		if(STAT(FROZEN, frag_target))
-			WITH(entity, self, frag_target, freezetag_Unfreeze(world));
+			WITHSELF(frag_target, freezetag_Unfreeze(world));
 		freezetag_count_alive_players();
 		return 1; // let the player die so that he can respawn whenever he wants
 	}
@@ -398,7 +398,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 			freezetag_LastPlayerForTeam_Notify();
 		}
 		else
-			WITH(entity, self, frag_target, freezetag_Unfreeze(world)); // remove ice
+			WITHSELF(frag_target, freezetag_Unfreeze(world)); // remove ice
 		frag_target.health = 0; // Unfreeze resets health
 		frag_target.freezetag_frozen_timeout = -2; // freeze on respawn
 		return 1;
@@ -407,7 +407,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 	if(STAT(FROZEN, frag_target))
 		return 1;
 
-	WITH(entity, self, frag_target, freezetag_Freeze(frag_attacker));
+	WITHSELF(frag_target, freezetag_Freeze(frag_attacker));
 	freezetag_LastPlayerForTeam_Notify();
 
 	if(frag_attacker == frag_target || frag_attacker == world)