X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_freezetag.qc;h=93547989097eb43aad853fa417268146eb14d1e9;hb=ee7a78f942624de2ab30112a798e3f663cf9cc2f;hp=236ec2dd86bfe2b53fcfb5d339386e093dab9870;hpb=9f70bdba9a6fb2c06324be13504341da967f7028;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 236ec2dd8..935479890 100644
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -1,3 +1,4 @@
+#include "gamemode_freezetag.qh"
 #ifndef GAMEMODE_FREEZETAG_H
 #define GAMEMODE_FREEZETAG_H
 
@@ -15,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
@@ -61,7 +62,7 @@ int autocvar_g_freezetag_teams_override;
 float autocvar_g_freezetag_warmup;
 
 const float SP_FREEZETAG_REVIVALS = 4;
-void freezetag_ScoreRules(float teams)
+void freezetag_ScoreRules(int teams)
 {
 	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true); // SFL_SORT_PRIO_PRIMARY
 	ScoreInfo_SetLabel_PlayerScore(SP_FREEZETAG_REVIVALS, "revivals", 0);
@@ -90,7 +91,7 @@ void freezetag_count_alive_players()
 	eliminatedPlayers.SendFlags |= 1;
 }
 #define FREEZETAG_ALIVE_TEAMS() ((redalive > 0) + (bluealive > 0) + (yellowalive > 0) + (pinkalive > 0))
-#define FREEZETAG_ALIVE_TEAMS_OK() (FREEZETAG_ALIVE_TEAMS() == freezetag_teams)
+#define FREEZETAG_ALIVE_TEAMS_OK() (FREEZETAG_ALIVE_TEAMS() == NumTeams(freezetag_teams))
 
 float freezetag_CheckTeams()
 {
@@ -98,23 +99,29 @@ float freezetag_CheckTeams()
 	if(FREEZETAG_ALIVE_TEAMS_OK())
 	{
 		if(prev_missing_teams_mask > 0)
-			Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_MISSING_TEAMS);
+			Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS);
 		prev_missing_teams_mask = -1;
 		return 1;
 	}
 	if(total_players == 0)
 	{
 		if(prev_missing_teams_mask > 0)
-			Kill_Notification(NOTIF_ALL, world, MSG_CENTER, CPID_MISSING_TEAMS);
+			Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS);
 		prev_missing_teams_mask = -1;
 		return 0;
 	}
-	float missing_teams_mask = (!redalive) + (!bluealive) * 2;
-	if(freezetag_teams >= 3) missing_teams_mask += (!yellowalive) * 4;
-	if(freezetag_teams >= 4) missing_teams_mask += (!pinkalive) * 8;
+	int missing_teams_mask = 0;
+	if(freezetag_teams & BIT(0))
+		missing_teams_mask += (!redalive) * 1;
+	if(freezetag_teams & BIT(1))
+		missing_teams_mask += (!bluealive) * 2;
+	if(freezetag_teams & BIT(2))
+		missing_teams_mask += (!yellowalive) * 4;
+	if(freezetag_teams & BIT(3))
+		missing_teams_mask += (!pinkalive) * 8;
 	if(prev_missing_teams_mask != missing_teams_mask)
 	{
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_MISSING_TEAMS, missing_teams_mask);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_MISSING_TEAMS, missing_teams_mask);
 		prev_missing_teams_mask = missing_teams_mask;
 	}
 	return 0;
@@ -149,8 +156,8 @@ float freezetag_CheckWinner()
 {
 	if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
 	{
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
 		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
 			it.freezetag_frozen_timeout = 0;
 			nades_Clear(it);
@@ -165,14 +172,14 @@ float freezetag_CheckWinner()
 	int winner_team = freezetag_getWinnerTeam();
 	if(winner_team > 0)
 	{
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
 		TeamScore_AddToTeam(winner_team, ST_SCORE, +1);
 	}
 	else if(winner_team == -1)
 	{
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_TIED);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_TIED);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_TIED);
 	}
 
 	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
@@ -183,71 +190,71 @@ float freezetag_CheckWinner()
 	return 1;
 }
 
-entity freezetag_LastPlayerForTeam()
-{SELFPARAM();
-	entity last_pl = world;
-	FOREACH_CLIENT(IS_PLAYER(it) && it != self, LAMBDA(
+entity freezetag_LastPlayerForTeam(entity this)
+{
+	entity last_pl = NULL;
+	FOREACH_CLIENT(IS_PLAYER(it) && it != this, LAMBDA(
 		if(it.health >= 1)
 		if(!STAT(FROZEN, it))
-		if(SAME_TEAM(it, self))
+		if(SAME_TEAM(it, this))
 		if(!last_pl)
 			last_pl = it;
 		else
-			return world;
+			return NULL;
 	));
 	return last_pl;
 }
 
-void freezetag_LastPlayerForTeam_Notify()
+void freezetag_LastPlayerForTeam_Notify(entity this)
 {
 	if(round_handler_IsActive())
 	if(round_handler_IsRoundStarted())
 	{
-		entity pl = freezetag_LastPlayerForTeam();
+		entity pl = freezetag_LastPlayerForTeam(this);
 		if(pl)
 			Send_Notification(NOTIF_ONE, pl, MSG_CENTER, CENTER_ALONE);
 	}
 }
 
-void freezetag_Add_Score(entity attacker)
-{SELFPARAM();
-	if(attacker == self)
+void freezetag_Add_Score(entity targ, entity attacker)
+{
+	if(attacker == targ)
 	{
-		// you froze your own dumb self
+		// you froze your own dumb targ
 		// counted as "suicide" already
-		PlayerScore_Add(self, SP_SCORE, -1);
+		PlayerScore_Add(targ, SP_SCORE, -1);
 	}
 	else if(IS_PLAYER(attacker))
 	{
 		// got frozen by an enemy
 		// counted as "kill" and "death" already
-		PlayerScore_Add(self, SP_SCORE, -1);
+		PlayerScore_Add(targ, SP_SCORE, -1);
 		PlayerScore_Add(attacker, SP_SCORE, +1);
 	}
 	// else nothing - got frozen by the game type rules themselves
 }
 
-void freezetag_Freeze(entity attacker)
-{SELFPARAM();
-	if(STAT(FROZEN, self))
+void freezetag_Freeze(entity targ, entity attacker)
+{
+	if(STAT(FROZEN, targ))
 		return;
 
 	if(autocvar_g_freezetag_frozen_maxtime > 0)
-		self.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_maxtime;
+		targ.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_maxtime;
 
-	Freeze(self, 0, 1, true);
+	Freeze(targ, 0, 1, true);
 
 	freezetag_count_alive_players();
 
-	freezetag_Add_Score(attacker);
+	freezetag_Add_Score(targ, attacker);
 }
 
-void freezetag_Unfreeze(entity attacker)
-{SELFPARAM();
-	self.freezetag_frozen_time = 0;
-	self.freezetag_frozen_timeout = 0;
+void freezetag_Unfreeze(entity this)
+{
+	this.freezetag_frozen_time = 0;
+	this.freezetag_frozen_timeout = 0;
 
-	Unfreeze(self);
+	Unfreeze(this);
 }
 
 float freezetag_isEliminated(entity e)
@@ -262,90 +269,87 @@ float freezetag_isEliminated(entity e)
 // Bot player logic
 // ================
 
-void() havocbot_role_ft_freeing;
-void() havocbot_role_ft_offense;
+void(entity this) havocbot_role_ft_freeing;
+void(entity this) havocbot_role_ft_offense;
 
-void havocbot_goalrating_freeplayers(float ratingscale, vector org, float sradius)
-{SELFPARAM();
-	float distance;
-
-	FOREACH_CLIENT(IS_PLAYER(it) && it != self && SAME_TEAM(it, self), LAMBDA(
+void havocbot_goalrating_freeplayers(entity this, float ratingscale, vector org, float sradius)
+{
+	FOREACH_CLIENT(IS_PLAYER(it) && it != this && SAME_TEAM(it, this), LAMBDA(
 		if (STAT(FROZEN, it) == 1)
 		{
-			distance = vlen(it.origin - org);
-			if (distance > sradius)
+			if(vdist(it.origin - org, >, sradius))
 				continue;
-			navigation_routerating(it, ratingscale, 2000);
+			navigation_routerating(this, it, ratingscale, 2000);
 		}
 		else
 		{
 			// If teamate is not frozen still seek them out as fight better
 			// in a group.
-			navigation_routerating(it, ratingscale/3, 2000);
+			navigation_routerating(this, it, ratingscale/3, 2000);
 		}
 	));
 }
 
-void havocbot_role_ft_offense()
-{SELFPARAM();
-	if(IS_DEAD(self))
+void havocbot_role_ft_offense(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (!self.havocbot_role_timeout)
-		self.havocbot_role_timeout = time + random() * 10 + 20;
+	if (!this.havocbot_role_timeout)
+		this.havocbot_role_timeout = time + random() * 10 + 20;
 
 	// Count how many players on team are unfrozen.
 	int unfrozen = 0;
-	FOREACH_CLIENT(IS_PLAYER(it) && SAME_TEAM(it, self) && !(STAT(FROZEN, it) != 1), LAMBDA(unfrozen++));
+	FOREACH_CLIENT(IS_PLAYER(it) && SAME_TEAM(it, this) && !(STAT(FROZEN, it) != 1), LAMBDA(unfrozen++));
 
 	// If only one left on team or if role has timed out then start trying to free players.
-	if (((unfrozen == 0) && (!STAT(FROZEN, self))) || (time > self.havocbot_role_timeout))
+	if (((unfrozen == 0) && (!STAT(FROZEN, this))) || (time > this.havocbot_role_timeout))
 	{
 		LOG_TRACE("changing role to freeing\n");
-		self.havocbot_role = havocbot_role_ft_freeing;
-		self.havocbot_role_timeout = 0;
+		this.havocbot_role = havocbot_role_ft_freeing;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (time > self.bot_strategytime)
+	if (time > this.bot_strategytime)
 	{
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-
-		navigation_goalrating_start();
-		havocbot_goalrating_items(10000, self.origin, 10000);
-		havocbot_goalrating_enemyplayers(20000, self.origin, 10000);
-		havocbot_goalrating_freeplayers(9000, self.origin, 10000);
-		//havocbot_goalrating_waypoints(1, self.origin, 1000);
-		navigation_goalrating_end();
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+
+		navigation_goalrating_start(this);
+		havocbot_goalrating_items(this, 10000, this.origin, 10000);
+		havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000);
+		havocbot_goalrating_freeplayers(this, 9000, this.origin, 10000);
+		//havocbot_goalrating_waypoints(1, this.origin, 1000);
+		navigation_goalrating_end(this);
 	}
 }
 
-void havocbot_role_ft_freeing()
-{SELFPARAM();
-	if(IS_DEAD(self))
+void havocbot_role_ft_freeing(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (!self.havocbot_role_timeout)
-		self.havocbot_role_timeout = time + random() * 10 + 20;
+	if (!this.havocbot_role_timeout)
+		this.havocbot_role_timeout = time + random() * 10 + 20;
 
-	if (time > self.havocbot_role_timeout)
+	if (time > this.havocbot_role_timeout)
 	{
 		LOG_TRACE("changing role to offense\n");
-		self.havocbot_role = havocbot_role_ft_offense;
-		self.havocbot_role_timeout = 0;
+		this.havocbot_role = havocbot_role_ft_offense;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (time > self.bot_strategytime)
+	if (time > this.bot_strategytime)
 	{
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-
-		navigation_goalrating_start();
-		havocbot_goalrating_items(8000, self.origin, 10000);
-		havocbot_goalrating_enemyplayers(10000, self.origin, 10000);
-		havocbot_goalrating_freeplayers(20000, self.origin, 10000);
-		//havocbot_goalrating_waypoints(1, self.origin, 1000);
-		navigation_goalrating_end();
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+
+		navigation_goalrating_start(this);
+		havocbot_goalrating_items(this, 8000, this.origin, 10000);
+		havocbot_goalrating_enemyplayers(this, 10000, this.origin, 10000);
+		havocbot_goalrating_freeplayers(this, 20000, this.origin, 10000);
+		//havocbot_goalrating_waypoints(1, this.origin, 1000);
+		navigation_goalrating_end(this);
 	}
 }
 
@@ -354,36 +358,43 @@ void havocbot_role_ft_freeing()
 // Hook Functions
 // ==============
 
-void ft_RemovePlayer()
-{SELFPARAM();
-	self.health = 0; // neccessary to update correctly alive stats
-	if(!STAT(FROZEN, self))
-		freezetag_LastPlayerForTeam_Notify();
-	freezetag_Unfreeze(world);
+void ft_RemovePlayer(entity this)
+{
+	this.health = 0; // neccessary to update correctly alive stats
+	if(!STAT(FROZEN, this))
+		freezetag_LastPlayerForTeam_Notify(this);
+	freezetag_Unfreeze(this);
 	freezetag_count_alive_players();
 }
 
 MUTATOR_HOOKFUNCTION(ft, ClientDisconnect)
-{SELFPARAM();
-	ft_RemovePlayer();
-	return 1;
+{
+	entity player = M_ARGV(0, entity);
+
+	ft_RemovePlayer(player);
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, MakePlayerObserver)
-{SELFPARAM();
-	ft_RemovePlayer();
-	return false;
+{
+	entity player = M_ARGV(0, entity);
+
+	ft_RemovePlayer(player);
 }
 
 MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 {
+	entity frag_attacker = M_ARGV(1, entity);
+	entity frag_target = M_ARGV(2, entity);
+	float frag_deathtype = M_ARGV(2, float);
+
 	if(round_handler_IsActive())
 	if(round_handler_CountdownRunning())
 	{
 		if(STAT(FROZEN, frag_target))
-			WITH(entity, self, frag_target, freezetag_Unfreeze(world));
+			freezetag_Unfreeze(frag_target);
 		freezetag_count_alive_players();
-		return 1; // let the player die so that he can respawn whenever he wants
+		return true; // let the player die so that he can respawn whenever he wants
 	}
 
 	// Cases DEATH_TEAMCHANGE and DEATH_AUTOTEAMCHANGE are needed to fix a bug whe
@@ -394,28 +405,28 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 		// let the player die, he will be automatically frozen when he respawns
 		if(STAT(FROZEN, frag_target) != 1)
 		{
-			freezetag_Add_Score(frag_attacker);
+			freezetag_Add_Score(frag_target, frag_attacker);
 			freezetag_count_alive_players();
-			freezetag_LastPlayerForTeam_Notify();
+			freezetag_LastPlayerForTeam_Notify(frag_target);
 		}
 		else
-			WITH(entity, self, frag_target, freezetag_Unfreeze(world)); // remove ice
+			freezetag_Unfreeze(frag_target); // remove ice
 		frag_target.health = 0; // Unfreeze resets health
 		frag_target.freezetag_frozen_timeout = -2; // freeze on respawn
-		return 1;
+		return true;
 	}
 
 	if(STAT(FROZEN, frag_target))
-		return 1;
+		return true;
 
-	WITH(entity, self, frag_target, freezetag_Freeze(frag_attacker));
-	freezetag_LastPlayerForTeam_Notify();
+	freezetag_Freeze(frag_target, frag_attacker);
+	freezetag_LastPlayerForTeam_Notify(frag_target);
 
-	if(frag_attacker == frag_target || frag_attacker == world)
+	if(frag_attacker == frag_target || frag_attacker == NULL)
 	{
 		if(IS_PLAYER(frag_target))
 			Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname);
 	}
 	else
 	{
@@ -423,21 +434,23 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies)
 			Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_FROZEN, frag_attacker.netname);
 		if(IS_PLAYER(frag_attacker))
 			Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_FREEZETAG_FREEZE, frag_target.netname);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname);
 	}
 
-	return 1;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, PlayerSpawn)
-{SELFPARAM();
-	if(self.freezetag_frozen_timeout == -1) // if PlayerSpawn is called by reset_map_players
-		return 1; // do nothing, round is starting right now
+{
+	entity player = M_ARGV(0, entity);
+
+	if(player.freezetag_frozen_timeout == -1) // if PlayerSpawn is called by reset_map_players
+		return true; // do nothing, round is starting right now
 
-	if(self.freezetag_frozen_timeout == -2) // player was dead
+	if(player.freezetag_frozen_timeout == -2) // player was dead
 	{
-		freezetag_Freeze(world);
-		return 1;
+		freezetag_Freeze(player, NULL);
+		return true;
 	}
 
 	freezetag_count_alive_players();
@@ -445,70 +458,71 @@ MUTATOR_HOOKFUNCTION(ft, PlayerSpawn)
 	if(round_handler_IsActive())
 	if(round_handler_IsRoundStarted())
 	{
-		Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_SPAWN_LATE);
-		freezetag_Freeze(world);
+		Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_SPAWN_LATE);
+		freezetag_Freeze(player, NULL);
 	}
 
-	return 1;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, reset_map_players)
-{SELFPARAM();
+{
 	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
 		it.killcount = 0;
 		it.freezetag_frozen_timeout = -1;
-		setself(it);
-		PutClientInServer();
+		PutClientInServer(it);
 		it.freezetag_frozen_timeout = 0;
 	));
 	freezetag_count_alive_players();
-	return 1;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, GiveFragsForKill, CBC_ORDER_FIRST)
 {
-	frag_score = 0; // no frags counted in Freeze Tag
-	return 1;
+	M_ARGV(2, float) = 0; // no frags counted in Freeze Tag
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
-{SELFPARAM();
+{
 	if(gameover)
-		return 1;
+		return true;
+
+	entity player = M_ARGV(0, entity);
 
-	if(STAT(FROZEN, self) == 1)
+	if(STAT(FROZEN, player) == 1)
 	{
 		// keep health = 1
-		self.pauseregen_finished = time + autocvar_g_balance_pause_health_regen;
+		player.pauseregen_finished = time + autocvar_g_balance_pause_health_regen;
 	}
 
 	if(round_handler_IsActive())
 	if(!round_handler_IsRoundStarted())
-		return 1;
+		return true;
 
 	int n;
 
 	entity o;
-	o = world;
-	//if(STAT(FROZEN, self))
-	//if(self.freezetag_frozen_timeout > 0 && time < self.freezetag_frozen_timeout)
-		//self.iceblock.alpha = ICE_MIN_ALPHA + (ICE_MAX_ALPHA - ICE_MIN_ALPHA) * (self.freezetag_frozen_timeout - time) / (self.freezetag_frozen_timeout - self.freezetag_frozen_time);
+	o = NULL;
+	//if(STAT(FROZEN, player))
+	//if(player.freezetag_frozen_timeout > 0 && time < player.freezetag_frozen_timeout)
+		//player.iceblock.alpha = ICE_MIN_ALPHA + (ICE_MAX_ALPHA - ICE_MIN_ALPHA) * (player.freezetag_frozen_timeout - time) / (player.freezetag_frozen_timeout - player.freezetag_frozen_time);
 
-	if(self.freezetag_frozen_timeout > 0 && time >= self.freezetag_frozen_timeout)
+	if(player.freezetag_frozen_timeout > 0 && time >= player.freezetag_frozen_timeout)
 		n = -1;
 	else
 	{
 		vector revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size;
 		n = 0;
-		FOREACH_CLIENT(IS_PLAYER(it) && it != self, LAMBDA(
+		FOREACH_CLIENT(IS_PLAYER(it) && it != player, LAMBDA(
 			if(STAT(FROZEN, it) == 0)
 			if(!IS_DEAD(it))
-			if(SAME_TEAM(it, self))
-			if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, it.absmin, it.absmax))
+			if(SAME_TEAM(it, player))
+			if(boxesoverlap(player.absmin - revive_extra_size, player.absmax + revive_extra_size, it.absmin, it.absmax))
 			{
 				if(!o)
 					o = it;
-				if(STAT(FROZEN, self) == 1)
+				if(STAT(FROZEN, player) == 1)
 					it.reviving = true;
 				++n;
 			}
@@ -516,21 +530,21 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
 
 	}
 
-	if(n && STAT(FROZEN, self) == 1) // OK, there is at least one teammate reviving us
+	if(n && STAT(FROZEN, player) == 1) // OK, there is at least one teammate reviving us
 	{
-		self.revive_progress = bound(0, self.revive_progress + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1);
-		self.health = max(1, self.revive_progress * ((warmup_stage) ? warmup_start_health : start_health));
+		player.revive_progress = bound(0, player.revive_progress + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1);
+		player.health = max(1, player.revive_progress * ((warmup_stage) ? warmup_start_health : start_health));
 
-		if(self.revive_progress >= 1)
+		if(player.revive_progress >= 1)
 		{
-			freezetag_Unfreeze(self);
+			freezetag_Unfreeze(player);
 			freezetag_count_alive_players();
 
 			if(n == -1)
 			{
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_AUTO_REVIVED, autocvar_g_freezetag_frozen_maxtime);
-				Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_AUTO_REVIVED, self.netname, autocvar_g_freezetag_frozen_maxtime);
-				return 1;
+				Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_AUTO_REVIVED, autocvar_g_freezetag_frozen_maxtime);
+				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_AUTO_REVIVED, player.netname, autocvar_g_freezetag_frozen_maxtime);
+				return true;
 			}
 
 			// EVERY team mate nearby gets a point (even if multiple!)
@@ -540,27 +554,27 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
 				nades_GiveBonus(it,autocvar_g_nades_bonus_score_low);
 			));
 
-			Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname);
-			Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, self.netname);
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED, self.netname, o.netname);
+			Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname);
+			Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, player.netname);
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED, player.netname, o.netname);
 		}
 
 		FOREACH_CLIENT(IS_PLAYER(it) && it.reviving, LAMBDA(
-			it.revive_progress = self.revive_progress;
+			it.revive_progress = player.revive_progress;
 			it.reviving = false;
 		));
 	}
-	else if(!n && STAT(FROZEN, self) == 1) // only if no teammate is nearby will we reset
+	else if(!n && STAT(FROZEN, player) == 1) // only if no teammate is nearby will we reset
 	{
-		self.revive_progress = bound(0, self.revive_progress - frametime * autocvar_g_freezetag_revive_clearspeed, 1);
-		self.health = max(1, self.revive_progress * ((warmup_stage) ? warmup_start_health : start_health));
+		player.revive_progress = bound(0, player.revive_progress - frametime * autocvar_g_freezetag_revive_clearspeed, 1);
+		player.health = max(1, player.revive_progress * ((warmup_stage) ? warmup_start_health : start_health));
 	}
-	else if(!n && !STAT(FROZEN, self))
+	else if(!n && !STAT(FROZEN, player))
 	{
-		self.revive_progress = 0; // thawing nobody
+		player.revive_progress = 0; // thawing nobody
 	}
 
-	return 1;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ft, SetStartItems)
@@ -574,18 +588,18 @@ MUTATOR_HOOKFUNCTION(ft, SetStartItems)
 	start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
 	start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
 	start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
-
-	return 0;
 }
 
 MUTATOR_HOOKFUNCTION(ft, HavocBot_ChooseRole)
-{SELFPARAM();
-	if (!IS_DEAD(self))
+{
+	entity bot = M_ARGV(0, entity);
+
+	if (!IS_DEAD(bot))
 	{
 		if (random() < 0.5)
-			self.havocbot_role = havocbot_role_ft_freeing;
+			bot.havocbot_role = havocbot_role_ft_freeing;
 		else
-			self.havocbot_role = havocbot_role_ft_offense;
+			bot.havocbot_role = havocbot_role_ft_offense;
 	}
 
 	return true;
@@ -593,16 +607,14 @@ MUTATOR_HOOKFUNCTION(ft, HavocBot_ChooseRole)
 
 MUTATOR_HOOKFUNCTION(ft, GetTeamCount, CBC_ORDER_EXCLUSIVE)
 {
-	ret_float = freezetag_teams;
-	return false;
+	M_ARGV(0, float) = freezetag_teams;
 }
 
 MUTATOR_HOOKFUNCTION(ft, SetWeaponArena)
 {
 	// most weapons arena
-	if(ret_string == "0" || ret_string == "")
-		ret_string = "most";
-	return false;
+	if(M_ARGV(0, string) == "0" || M_ARGV(0, string) == "")
+		M_ARGV(0, string) = "most";
 }
 
 void freezetag_Initialize()
@@ -611,6 +623,14 @@ void freezetag_Initialize()
 	if(freezetag_teams < 2)
 		freezetag_teams = autocvar_g_freezetag_teams;
 	freezetag_teams = bound(2, freezetag_teams, 4);
+
+	int teams = 0;
+	if(freezetag_teams >= 1) teams |= BIT(0);
+	if(freezetag_teams >= 2) teams |= BIT(1);
+	if(freezetag_teams >= 3) teams |= BIT(2);
+	if(freezetag_teams >= 4) teams |= BIT(3);
+
+	freezetag_teams = teams; // now set it?
 	freezetag_ScoreRules(freezetag_teams);
 
 	round_handler_Spawn(freezetag_CheckTeams, freezetag_CheckWinner, func_null);