X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keyhunt.qc;h=448a2bbc78c47d1d905de3a9d13910e71a987e74;hb=451e02a2857d8c671f6dcf6a0639ea7c609b3ba9;hp=341d133084664ebf1148b7a06465bcfa2b1e315f;hpb=65cb7f7edc8fd2de641b1221156efb4cd132ba34;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
index 341d13308..d3ec3358e 100644
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
@@ -1,65 +1,12 @@
-#ifndef GAMEMODE_KEYHUNT_H
-#define GAMEMODE_KEYHUNT_H
-
-#define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit")
-int autocvar_g_keyhunt_point_leadlimit;
-bool autocvar_g_keyhunt_team_spawns;
-void kh_Initialize();
-
-REGISTER_MUTATOR(kh, false)
-{
-	MUTATOR_ONADD
-	{
-		if (time > 1) // game loads at time 1
-			error("This is a game type and it cannot be added at runtime.");
-		kh_Initialize();
-
-		ActivateTeamplay();
-		SetLimits(autocvar_g_keyhunt_point_limit, autocvar_g_keyhunt_point_leadlimit, -1, -1);
-		if (autocvar_g_keyhunt_team_spawns)
-			have_team_spawns = -1; // request team spawns
-	}
-
-	MUTATOR_ONROLLBACK_OR_REMOVE
-	{
-		// we actually cannot roll back kh_Initialize here
-		// BUT: we don't need to! If this gets called, adding always
-		// succeeds.
-	}
-
-	MUTATOR_ONREMOVE
-	{
-		LOG_INFO("This is a game type and it cannot be removed at runtime.");
-		return -1;
-	}
-
-	return 0;
-}
-
-#define FOR_EACH_KH_KEY(v) for(v = kh_worldkeylist; v; v = v.kh_worldkeynext )
-
-// ALL OF THESE should be removed in the future, as other code should not have to care
-
-// used by bots:
-float kh_tracking_enabled;
-.entity kh_next;
-float kh_Key_AllOwnedByWhichTeam();
-
-typedef void(void) kh_Think_t;
-void kh_StartRound();
-void kh_Controller_SetThink(float t, kh_Think_t func);
-
-entity kh_worldkeylist;
-.entity kh_worldkeynext;
-#endif
-
-#ifdef IMPLEMENTATION
+#include "gamemode_keyhunt.qh"
 
 float autocvar_g_balance_keyhunt_damageforcescale;
 float autocvar_g_balance_keyhunt_delay_collect;
+float autocvar_g_balance_keyhunt_delay_damage_return;
 float autocvar_g_balance_keyhunt_delay_return;
 float autocvar_g_balance_keyhunt_delay_round;
 float autocvar_g_balance_keyhunt_delay_tracking;
+float autocvar_g_balance_keyhunt_return_when_unreachable;
 float autocvar_g_balance_keyhunt_dropvelocity;
 float autocvar_g_balance_keyhunt_maxdist;
 float autocvar_g_balance_keyhunt_protecttime;
@@ -72,7 +19,7 @@ int autocvar_g_balance_keyhunt_score_destroyed_ownfactor;
 int autocvar_g_balance_keyhunt_score_push;
 float autocvar_g_balance_keyhunt_throwvelocity;
 
-int autocvar_g_keyhunt_teams;
+//int autocvar_g_keyhunt_teams;
 int autocvar_g_keyhunt_teams_override;
 
 // #define KH_PLAYER_USE_ATTACHMENT
@@ -95,24 +42,24 @@ const vector KH_KEY_MIN = '-10 -10 -46';
 const vector KH_KEY_MAX = '10 10 3';
 const float KH_KEY_BRIGHTNESS = 2;
 
-float kh_no_radar_circles;
+bool kh_no_radar_circles;
 
 // kh_state
 //     bits  0- 4: team of key 1, or 0 for no such key, or 30 for dropped, or 31 for self
 //     bits  5- 9: team of key 2, or 0 for no such key, or 30 for dropped, or 31 for self
 //     bits 10-14: team of key 3, or 0 for no such key, or 30 for dropped, or 31 for self
 //     bits 15-19: team of key 4, or 0 for no such key, or 30 for dropped, or 31 for self
-.float kh_state;
+.int kh_state = _STAT(KH_KEYS);
 .float siren_time;  //  time delay the siren
 //.float stuff_time;  //  time delay to stuffcmd a cvar
 
-float kh_keystatus[17];
+int kh_keystatus[17];
 //kh_keystatus[0] = status of dropped keys, kh_keystatus[1 - 16] = player #
 //replace 17 with cvar("maxplayers") or similar !!!!!!!!!
 //for(i = 0; i < maxplayers; ++i)
 //	kh_keystatus[i] = "0";
 
-float kh_Team_ByID(float t)
+int kh_Team_ByID(int t)
 {
 	if(t == 0) return NUM_TEAM_1;
 	if(t == 1) return NUM_TEAM_2;
@@ -124,26 +71,22 @@ float kh_Team_ByID(float t)
 //entity kh_worldkeylist;
 .entity kh_worldkeynext;
 entity kh_controller;
-//float kh_tracking_enabled;
-float kh_teams;
-float kh_interferemsg_time, kh_interferemsg_team;
+//bool kh_tracking_enabled;
+int kh_teams;
+int kh_interferemsg_team;
+float kh_interferemsg_time;
 .entity kh_next, kh_prev; // linked list
 .float kh_droptime;
-.float kh_dropperteam;
+.int kh_dropperteam;
 .entity kh_previous_owner;
-.float kh_previous_owner_playerid;
-.float kh_cp_duration;
+.int kh_previous_owner_playerid;
+
+int kh_key_dropped, kh_key_carried;
 
-float kh_key_dropped, kh_key_carried;
+int kh_Key_AllOwnedByWhichTeam();
 
 const float ST_KH_CAPS = 1;
-const float SP_KH_CAPS = 4;
-const float SP_KH_PUSHES = 5;
-const float SP_KH_DESTROYS = 6;
-const float SP_KH_PICKUPS = 7;
-const float SP_KH_KCKILLS = 8;
-const float SP_KH_LOSSES = 9;
-void kh_ScoreRules(float teams)
+void kh_ScoreRules(int teams)
 {
 	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, SFL_SORT_PRIO_PRIMARY, true);
 	ScoreInfo_SetLabel_TeamScore(  ST_KH_CAPS,      "caps",      SFL_SORT_PRIO_SECONDARY);
@@ -156,34 +99,31 @@ void kh_ScoreRules(float teams)
 	ScoreRules_basics_end();
 }
 
-float kh_KeyCarrier_waypointsprite_visible_for_player(entity e)  // runs all the time
-{SELFPARAM();
-	if(!IS_PLAYER(e) || self.team != e.team)
+bool kh_KeyCarrier_waypointsprite_visible_for_player(entity this, entity player, entity view)  // runs all the time
+{
+	if(!IS_PLAYER(view) || DIFF_TEAM(this, view))
 		if(!kh_tracking_enabled)
 			return false;
 
 	return true;
 }
 
-float kh_Key_waypointsprite_visible_for_player(entity e) // ??
-{SELFPARAM();
+bool kh_Key_waypointsprite_visible_for_player(entity this, entity player, entity view)
+{
 	if(!kh_tracking_enabled)
 		return false;
-	if(!self.owner)
+	if(!this.owner)
 		return true;
-	if(!self.owner.owner)
+	if(!this.owner.owner)
 		return true;
 	return false;  // draw only when key is not owned
 }
 
 void kh_update_state()
 {
-	entity player;
 	entity key;
-	float s;
-	float f;
-
-	s = 0;
+	int f;
+	int s = 0;
 	FOR_EACH_KH_KEY(key)
 	{
 		if(key.owner)
@@ -193,17 +133,14 @@ void kh_update_state()
 		s |= pow(32, key.count) * f;
 	}
 
-	FOR_EACH_CLIENT(player)
-	{
-		player.kh_state = s;
-	}
+	FOREACH_CLIENT(true, LAMBDA(it.kh_state = s));
 
 	FOR_EACH_KH_KEY(key)
 	{
 		if(key.owner)
 			key.owner.kh_state |= pow(32, key.count) * 31;
 	}
-	//print(ftos((nextent(world)).kh_state), "\n");
+	//print(ftos((nextent(NULL)).kh_state), "\n");
 }
 
 
@@ -218,18 +155,21 @@ void kh_Controller_SetThink(float t, kh_Think_t func)  // runs occasionaly
 		kh_controller.nextthink = time; // force
 }
 void kh_WaitForPlayers();
-void kh_Controller_Think()  // called a lot
-{SELFPARAM();
-	if(intermission_running)
+void kh_Controller_Think(entity this)  // called a lot
+{
+	if(gameover)
 		return;
-	if(self.cnt > 0)
-	{ if(self.think != kh_WaitForPlayers) { self.cnt -= 1; } }
-	else if(self.cnt == 0)
+	if(this.cnt > 0)
 	{
-		self.cnt -= 1;
+		if(getthink(this) != kh_WaitForPlayers)
+			this.cnt -= 1;
+	}
+	else if(this.cnt == 0)
+	{
+		this.cnt -= 1;
 		kh_Controller_Thinkfunc();
 	}
-	self.nextthink = time + 1;
+	this.nextthink = time + 1;
 }
 
 // frags f: take from cvar * f
@@ -237,7 +177,7 @@ void kh_Controller_Think()  // called a lot
 void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner)  // update the score when a key is captured
 {
 	string s;
-	if(intermission_running)
+	if(gameover)
 		return;
 
 	if(frags_player)
@@ -278,8 +218,7 @@ vector kh_AttachedOrigin(entity e)  // runs when a team captures the flag, it ca
 void kh_Key_Attach(entity key)  // runs when a player picks up a key and several times when a key is assigned to a player at the start of a round
 {
 #ifdef KH_PLAYER_USE_ATTACHMENT
-	entity first;
-	first = key.owner.kh_next;
+	entity first = key.owner.kh_next;
 	if(key == first)
 	{
 		setattachment(key, key.owner, KH_PLAYER_ATTACHMENT_BONE);
@@ -309,8 +248,9 @@ void kh_Key_Attach(entity key)  // runs when a player picks up a key and several
 	key.angles_y -= key.owner.angles.y;
 #endif
 	key.flags = 0;
+	IL_REMOVE(g_items, key);
 	key.solid = SOLID_NOT;
-	key.movetype = MOVETYPE_NONE;
+	set_movetype(key, MOVETYPE_NONE);
 	key.team = key.owner.team;
 	key.nextthink = time;
 	key.damageforcescale = 0;
@@ -321,8 +261,7 @@ void kh_Key_Attach(entity key)  // runs when a player picks up a key and several
 void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs several times times when all the keys are captured
 {
 #ifdef KH_PLAYER_USE_ATTACHMENT
-	entity first;
-	first = key.owner.kh_next;
+	entity first = key.owner.kh_next;
 	if(key == first)
 	{
 		if(key.kh_next)
@@ -339,17 +278,18 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs
 		setorigin(first, first.origin + 0.5 * KH_PLAYER_ATTACHMENT_DIST);
 	}
 	// in any case:
-	setattachment(key, world, "");
-	setorigin(key, key.owner.origin + '0 0 1' * (PL_MIN.z - KH_KEY_MIN_z));
+	setattachment(key, NULL, "");
+	setorigin(key, key.owner.origin + '0 0 1' * (STAT(PL_MIN, key.owner).z - KH_KEY_MIN_z));
 	key.angles = key.owner.angles;
 #else
 	setorigin(key, key.owner.origin + key.origin.z * '0 0 1');
-	setattachment(key, world, "");
+	setattachment(key, NULL, "");
 	key.angles_y += key.owner.angles.y;
 #endif
 	key.flags = FL_ITEM;
+	IL_PUSH(g_items, key);
 	key.solid = SOLID_TRIGGER;
-	key.movetype = MOVETYPE_TOSS;
+	set_movetype(key, MOVETYPE_TOSS);
 	key.pain_finished = time + autocvar_g_balance_keyhunt_delay_return;
 	key.damageforcescale = autocvar_g_balance_keyhunt_damageforcescale;
 	key.takedamage = DAMAGE_YES;
@@ -361,12 +301,10 @@ void kh_Key_Detach(entity key) // runs every time a key is dropped or lost. Runs
 
 void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is picked up or assigned. Runs prior to kh_key_attach
 {
-	entity k;
-	float ownerteam0, ownerteam;
 	if(key.owner == player)
 		return;
 
-	ownerteam0 = kh_Key_AllOwnedByWhichTeam();
+	int ownerteam0 = kh_Key_AllOwnedByWhichTeam();
 
 	if(key.owner)
 	{
@@ -376,10 +314,10 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 		if(key.kh_next)
 			key.kh_next.kh_prev = key.kh_prev;
 		key.kh_prev.kh_next = key.kh_next;
-		key.kh_next = world;
-		key.kh_prev = world;
+		key.kh_next = NULL;
+		key.kh_prev = NULL;
 
-		if(key.owner.kh_next == world)
+		if(key.owner.kh_next == NULL)
 		{
 			// No longer a key carrier
 			if(!kh_no_radar_circles)
@@ -413,7 +351,7 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 
 		kh_Key_Attach(key);
 
-		if(key.kh_next == world)
+		if(key.kh_next == NULL)
 		{
 			// player is now a key carrier
 			entity wp = WaypointSprite_AttachCarrier(WP_Null, player, RADARICON_FLAGCARRIER);
@@ -436,17 +374,18 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 	// moved that here, also update if there's no player
 	kh_update_state();
 
-	key.pusher = world;
+	key.pusher = NULL;
 
-	ownerteam = kh_Key_AllOwnedByWhichTeam();
+	int ownerteam = kh_Key_AllOwnedByWhichTeam();
 	if(ownerteam != ownerteam0)
 	{
+		entity k;
 		if(ownerteam != -1)
 		{
 			kh_interferemsg_time = time + 0.2;
 			kh_interferemsg_team = player.team;
 
-			// audit all key carrier sprites, update them to RUN HERE
+			// audit all key carrier sprites, update them to "Run here"
 			FOR_EACH_KH_KEY(k)
 			{
 				if (!k.owner) continue;
@@ -461,7 +400,7 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 		{
 			kh_interferemsg_time = 0;
 
-			// audit all key carrier sprites, update them to RUN HERE
+			// audit all key carrier sprites, update them to "Key Carrier"
 			FOR_EACH_KH_KEY(k)
 			{
 				if (!k.owner) continue;
@@ -475,22 +414,20 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
 	}
 }
 
-void kh_Key_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
-	if(self.owner)
+void kh_Key_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+{
+	if(this.owner)
 		return;
 	if(ITEM_DAMAGE_NEEDKILL(deathtype))
 	{
-		// touching lava, or hurt trigger
-		// what shall we do?
-		// immediately return is bad
-		// maybe start a shorter countdown?
+		this.pain_finished = bound(time, time + autocvar_g_balance_keyhunt_delay_damage_return, this.pain_finished);
+		return;
 	}
-	if(vlen(force) <= 0)
+	if(force == '0 0 0')
 		return;
-	if(time > self.pushltime)
+	if(time > this.pushltime)
 		if(IS_PLAYER(attacker))
-			self.team = attacker.team;
+			this.team = attacker.team;
 }
 
 void kh_Key_Collect(entity key, entity player)  //a player picks up a dropped key
@@ -503,42 +440,40 @@ void kh_Key_Collect(entity key, entity player)  //a player picks up a dropped ke
 		PlayerScore_Add(player, SP_KH_PICKUPS, 1);
 	}
 	key.kh_dropperteam = 0;
-	Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_PICKUP_), player.netname);
+	int realteam = kh_Team_ByID(key.count);
+	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_PICKUP), player.netname);
 
 	kh_Key_AssignTo(key, player); // this also updates .kh_state
 }
 
-void kh_Key_Touch()  // runs many, many times when a key has been dropped and can be picked up
-{SELFPARAM();
-	if(intermission_running)
+void kh_Key_Touch(entity this, entity toucher)  // runs many, many times when a key has been dropped and can be picked up
+{
+	if(gameover)
 		return;
 
-	if(self.owner) // already carried
+	if(this.owner) // already carried
 		return;
 
 	if(ITEM_TOUCH_NEEDKILL())
 	{
-		// touching sky, or nodrop
-		// what shall we do?
-		// immediately return is bad
-		// maybe start a shorter countdown?
+		this.pain_finished = bound(time, time + autocvar_g_balance_keyhunt_delay_damage_return, this.pain_finished);
+		return;
 	}
 
-	if (!IS_PLAYER(other))
+	if (!IS_PLAYER(toucher))
 		return;
-	if(other.deadflag != DEAD_NO)
+	if(IS_DEAD(toucher))
 		return;
-	if(other == self.enemy)
-		if(time < self.kh_droptime + autocvar_g_balance_keyhunt_delay_collect)
+	if(toucher == this.enemy)
+		if(time < this.kh_droptime + autocvar_g_balance_keyhunt_delay_collect)
 			return;  // you just dropped it!
-	kh_Key_Collect(self, other);
+	kh_Key_Collect(this, toucher);
 }
 
 void kh_Key_Remove(entity key)  // runs after when all the keys have been collected or when a key has been dropped for more than X seconds
 {
-	entity o;
-	o = key.owner;
-	kh_Key_AssignTo(key, world);
+	entity o = key.owner;
+	kh_Key_AssignTo(key, NULL);
 	if(o) // it was attached
 		WaypointSprite_Kill(key.waypointsprite_attachedforcarrier);
 	else // it was dropped
@@ -561,7 +496,7 @@ void kh_Key_Remove(entity key)  // runs after when all the keys have been collec
 		}
 	}
 
-	remove(key);
+	delete(key);
 
 	kh_update_state();
 }
@@ -577,31 +512,29 @@ void kh_FinishRound()  // runs when a team captures the keys
 		kh_Key_Remove(key);
 	kh_no_radar_circles = false;
 
-	Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_KEYHUNT_ROUNDSTART, autocvar_g_balance_keyhunt_delay_round);
+	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_KEYHUNT_ROUNDSTART, autocvar_g_balance_keyhunt_delay_round);
 	kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round, kh_StartRound);
 }
 
-void kh_WinnerTeam(float teem)  // runs when a team wins // Samual: Teem?.... TEEM?!?! what the fuck is wrong with you people
+void nades_GiveBonus(entity player, float score);
+
+void kh_WinnerTeam(int winner_team)  // runs when a team wins
 {
 	// all key carriers get some points
-	vector firstorigin, lastorigin, midpoint;
-	float first;
 	entity key;
-	float score;
-	score = (kh_teams - 1) * autocvar_g_balance_keyhunt_score_capture;
-	DistributeEvenly_Init(score, kh_teams);
+	float score = (NumTeams(kh_teams) - 1) * autocvar_g_balance_keyhunt_score_capture;
+	DistributeEvenly_Init(score, NumTeams(kh_teams));
 	// twice the score for 3 team games, three times the score for 4 team games!
 	// note: for a win by destroying the key, this should NOT be applied
 	FOR_EACH_KH_KEY(key)
 	{
-		float f;
-		f = DistributeEvenly_Get(1);
+		float f = DistributeEvenly_Get(1);
 		kh_Scores_Event(key.owner, key, "capture", f, 0);
 		PlayerTeamScore_Add(key.owner, SP_KH_CAPS, ST_KH_CAPS, 1);
 		nades_GiveBonus(key.owner, autocvar_g_nades_bonus_score_high);
 	}
 
-	first = true;
+	bool first = true;
 	string keyowner = "";
 	FOR_EACH_KH_KEY(key)
 		if(key.owner.kh_next == key)
@@ -612,77 +545,68 @@ void kh_WinnerTeam(float teem)  // runs when a team wins // Samual: Teem?.... TE
 			first = false;
 		}
 
-	Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(teem, INFO_KEYHUNT_CAPTURE_), keyowner);
+	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_KEYHUNT_CAPTURE), keyowner);
 
 	first = true;
-	midpoint = '0 0 0';
-	firstorigin = '0 0 0';
-	lastorigin = '0 0 0';
+	vector firstorigin = '0 0 0', lastorigin = '0 0 0', midpoint = '0 0 0';
 	FOR_EACH_KH_KEY(key)
 	{
-		vector thisorigin;
-
-		thisorigin = kh_AttachedOrigin(key);
+		vector thisorigin = kh_AttachedOrigin(key);
 		//dprint("Key origin: ", vtos(thisorigin), "\n");
 		midpoint += thisorigin;
 
 		if(!first)
-			te_lightning2(world, lastorigin, thisorigin);
+			te_lightning2(NULL, lastorigin, thisorigin);
 		lastorigin = thisorigin;
 		if(first)
 			firstorigin = thisorigin;
 		first = false;
 	}
-	if(kh_teams > 2)
+	if(NumTeams(kh_teams) > 2)
 	{
-		te_lightning2(world, lastorigin, firstorigin);
+		te_lightning2(NULL, lastorigin, firstorigin);
 	}
-	midpoint = midpoint * (1 / kh_teams);
-	te_customflash(midpoint, 1000, 1, Team_ColorRGB(teem) * 0.5 + '0.5 0.5 0.5');  // make the color >=0.5 in each component
+	midpoint = midpoint * (1 / NumTeams(kh_teams));
+	te_customflash(midpoint, 1000, 1, Team_ColorRGB(winner_team) * 0.5 + '0.5 0.5 0.5');  // make the color >=0.5 in each component
 
 	play2all(SND(KH_CAPTURE));
 	kh_FinishRound();
 }
 
-void kh_LoserTeam(float teem, entity lostkey)  // runs when a player pushes a flag carrier off the map
+void kh_LoserTeam(int loser_team, entity lostkey)  // runs when a player pushes a flag carrier off the map
 {
-	entity player, key, attacker;
-	float players;
-	float keys;
 	float f;
-
-	attacker = world;
+	entity attacker = NULL;
 	if(lostkey.pusher)
-		if(lostkey.pusher.team != teem)
+		if(lostkey.pusher.team != loser_team)
 			if(IS_PLAYER(lostkey.pusher))
 				attacker = lostkey.pusher;
 
-	players = keys = 0;
-
 	if(attacker)
 	{
 		if(lostkey.kh_previous_owner)
-			kh_Scores_Event(lostkey.kh_previous_owner, world, "pushed", 0, -autocvar_g_balance_keyhunt_score_push);
+			kh_Scores_Event(lostkey.kh_previous_owner, NULL, "pushed", 0, -autocvar_g_balance_keyhunt_score_push);
 			// don't actually GIVE him the -nn points, just log
-		kh_Scores_Event(attacker, world, "push", autocvar_g_balance_keyhunt_score_push, 0);
+		kh_Scores_Event(attacker, NULL, "push", autocvar_g_balance_keyhunt_score_push, 0);
 		PlayerScore_Add(attacker, SP_KH_PUSHES, 1);
 		//centerprint(attacker, "Your push is the best!"); // does this really need to exist?
 	}
 	else
 	{
-		float of, fragsleft, i, j, thisteam;
-		of = autocvar_g_balance_keyhunt_score_destroyed_ownfactor;
+		int players = 0;
+		float of = autocvar_g_balance_keyhunt_score_destroyed_ownfactor;
 
-		FOR_EACH_PLAYER(player)
-			if(player.team != teem)
-				++players;
+		FOREACH_CLIENT(IS_PLAYER(it) && it.team != loser_team, LAMBDA(++players));
 
+		entity key;
+		int keys = 0;
 		FOR_EACH_KH_KEY(key)
-			if(key.owner && key.team != teem)
+			if(key.owner && key.team != loser_team)
 				++keys;
 
 		if(lostkey.kh_previous_owner)
-			kh_Scores_Event(lostkey.kh_previous_owner, world, "destroyed", 0, -autocvar_g_balance_keyhunt_score_destroyed);
+			kh_Scores_Event(lostkey.kh_previous_owner, NULL, "destroyed", 0, -autocvar_g_balance_keyhunt_score_destroyed);
 			// don't actually GIVE him the -nn points, just log
 
 		if(lostkey.kh_previous_owner.playerid == lostkey.kh_previous_owner_playerid)
@@ -691,43 +615,44 @@ void kh_LoserTeam(float teem, entity lostkey)  // runs when a player pushes a fl
 		DistributeEvenly_Init(autocvar_g_balance_keyhunt_score_destroyed, keys * of + players);
 
 		FOR_EACH_KH_KEY(key)
-			if(key.owner && key.team != teem)
+			if(key.owner && key.team != loser_team)
 			{
 				f = DistributeEvenly_Get(of);
-				kh_Scores_Event(key.owner, world, "destroyed_holdingkey", f, 0);
+				kh_Scores_Event(key.owner, NULL, "destroyed_holdingkey", f, 0);
 			}
 
-		fragsleft = DistributeEvenly_Get(players);
+		int fragsleft = DistributeEvenly_Get(players);
 
 		// Now distribute these among all other teams...
-		j = kh_teams - 1;
-		for(i = 0; i < kh_teams; ++i)
+		int j = NumTeams(kh_teams) - 1;
+		for(int i = 0; i < NumTeams(kh_teams); ++i)
 		{
-			thisteam = kh_Team_ByID(i);
-			if(thisteam == teem) // bad boy, no cookie - this WILL happen
+			int thisteam = kh_Team_ByID(i);
+			if(thisteam == loser_team) // bad boy, no cookie - this WILL happen
 				continue;
 
 			players = 0;
-			FOR_EACH_PLAYER(player)
-				if(player.team == thisteam)
-					++players;
+			FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA(++players));
 
 			DistributeEvenly_Init(fragsleft, j);
 			fragsleft = DistributeEvenly_Get(j - 1);
 			DistributeEvenly_Init(DistributeEvenly_Get(1), players);
 
-			FOR_EACH_PLAYER(player)
-				if(player.team == thisteam)
-				{
-					f = DistributeEvenly_Get(1);
-					kh_Scores_Event(player, world, "destroyed", f, 0);
-				}
+			FOREACH_CLIENT(IS_PLAYER(it) && it.team == thisteam, LAMBDA(
+				f = DistributeEvenly_Get(1);
+				kh_Scores_Event(it, NULL, "destroyed", f, 0);
+			));
 
 			--j;
 		}
 	}
 
-	Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(lostkey, INFO_KEYHUNT_LOST_), lostkey.kh_previous_owner.netname);
+	int realteam = kh_Team_ByID(lostkey.count);
+	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(loser_team, CENTER_ROUND_TEAM_LOSS));
+	if(attacker)
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_PUSHED), attacker.netname, lostkey.kh_previous_owner.netname);
+	else
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_DESTROYED), lostkey.kh_previous_owner.netname);
 
 	play2all(SND(KH_DESTROY));
 	te_tarexplosion(lostkey.origin);
@@ -735,68 +660,63 @@ void kh_LoserTeam(float teem, entity lostkey)  // runs when a player pushes a fl
 	kh_FinishRound();
 }
 
-void kh_Key_Think()  // runs all the time
-{SELFPARAM();
-	entity head;
-	//entity player;  // needed by FOR_EACH_PLAYER
-
-	if(intermission_running)
+void kh_Key_Think(entity this)  // runs all the time
+{
+	if(gameover)
 		return;
 
-	if(self.owner)
+	if(this.owner)
 	{
 #ifndef KH_PLAYER_USE_ATTACHMENT
-		makevectors('0 1 0' * (self.cnt + (time % 360) * KH_KEY_XYSPEED));
-		setorigin(self, v_forward * KH_KEY_XYDIST + '0 0 1' * self.origin.z);
+		makevectors('0 1 0' * (this.cnt + (time % 360) * KH_KEY_XYSPEED));
+		setorigin(this, v_forward * KH_KEY_XYDIST + '0 0 1' * this.origin.z);
 #endif
 	}
 
 	// if in nodrop or time over, end the round
-	if(!self.owner)
-		if(time > self.pain_finished)
-			kh_LoserTeam(self.team, self);
+	if(!this.owner)
+		if(time > this.pain_finished)
+			kh_LoserTeam(this.team, this);
 
-	if(self.owner)
+	if(this.owner)
 	if(kh_Key_AllOwnedByWhichTeam() != -1)
 	{
-		if(self.siren_time < time)
+		if(this.siren_time < time)
 		{
-			sound(self.owner, CH_TRIGGER, SND_KH_ALARM, VOL_BASE, ATTEN_NORM);  // play a simple alarm
-			self.siren_time = time + 2.5;  // repeat every 2.5 seconds
+			sound(this.owner, CH_TRIGGER, SND_KH_ALARM, VOL_BASE, ATTEN_NORM);  // play a simple alarm
+			this.siren_time = time + 2.5;  // repeat every 2.5 seconds
 		}
 
 		entity key;
-		vector p;
-		p = self.owner.origin;
+		vector p = this.owner.origin;
 		FOR_EACH_KH_KEY(key)
-			if(vlen(key.owner.origin - p) > autocvar_g_balance_keyhunt_maxdist)
+			if(vdist(key.owner.origin - p, >, autocvar_g_balance_keyhunt_maxdist))
 				goto not_winning;
-		kh_WinnerTeam(self.team);
-:not_winning
+		kh_WinnerTeam(this.team);
+LABEL(not_winning)
 	}
 
 	if(kh_interferemsg_time && time > kh_interferemsg_time)
 	{
 		kh_interferemsg_time = 0;
-		FOR_EACH_PLAYER(head)
-		{
-			if(head.team == kh_interferemsg_team)
-				if(head.kh_next)
-					Send_Notification(NOTIF_ONE, head, MSG_CENTER, CENTER_KEYHUNT_MEET);
+		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+			if(it.team == kh_interferemsg_team)
+				if(it.kh_next)
+					Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_MEET);
 				else
-					Send_Notification(NOTIF_ONE, head, MSG_CENTER, CENTER_KEYHUNT_HELP);
+					Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_HELP);
 			else
-				Send_Notification(NOTIF_ONE, head, MSG_CENTER, APP_TEAM_NUM_4(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE_));
-		}
+				Send_Notification(NOTIF_ONE, it, MSG_CENTER, APP_TEAM_NUM(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE));
+		));
 	}
 
-	self.nextthink = time + 0.05;
+	this.nextthink = time + 0.05;
 }
 
-void key_reset()
-{SELFPARAM();
-	kh_Key_AssignTo(self, world);
-	kh_Key_Remove(self);
+void key_reset(entity this)
+{
+	kh_Key_AssignTo(this, NULL);
+	kh_Key_Remove(this);
 }
 
 const string STR_ITEM_KH_KEY = "item_kh_key";
@@ -805,14 +725,16 @@ void kh_Key_Spawn(entity initial_owner, float _angle, float i)  // runs every ti
 	entity key = spawn();
 	key.count = i;
 	key.classname = STR_ITEM_KH_KEY;
-	key.touch = kh_Key_Touch;
-	key.think = kh_Key_Think;
+	settouch(key, kh_Key_Touch);
+	setthink(key, kh_Key_Think);
 	key.nextthink = time;
 	key.items = IT_KEY1 | IT_KEY2;
 	key.cnt = _angle;
 	key.angles = '0 360 0' * random();
 	key.event_damage = kh_Key_Damage;
 	key.takedamage = DAMAGE_YES;
+	key.damagedbytriggers = autocvar_g_balance_keyhunt_return_when_unreachable;
+	key.damagedbycontents = autocvar_g_balance_keyhunt_return_when_unreachable;
 	key.modelindex = kh_key_dropped;
 	key.model = "key";
 	key.kh_dropperteam = 0;
@@ -844,23 +766,20 @@ void kh_Key_Spawn(entity initial_owner, float _angle, float i)  // runs every ti
 	key.kh_worldkeynext = kh_worldkeylist;
 	kh_worldkeylist = key;
 
-	Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_NUM_4(initial_owner.team, CENTER_KEYHUNT_START_));
+	Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_NUM(initial_owner.team, CENTER_KEYHUNT_START));
 
-	WaypointSprite_Spawn(WP_KeyDropped, 0, 0, key, '0 0 1' * KH_KEY_WP_ZSHIFT, world, key.team, key, waypointsprite_attachedforcarrier, false, RADARICON_FLAG);
+	WaypointSprite_Spawn(WP_KeyDropped, 0, 0, key, '0 0 1' * KH_KEY_WP_ZSHIFT, NULL, key.team, key, waypointsprite_attachedforcarrier, false, RADARICON_FLAG);
 	key.waypointsprite_attachedforcarrier.waypointsprite_visible_for_player = kh_Key_waypointsprite_visible_for_player;
 
 	kh_Key_AssignTo(key, initial_owner);
 }
 
 // -1 when no team completely owns all keys yet
-float kh_Key_AllOwnedByWhichTeam()  // constantly called. check to see if all the keys are owned by the same team
+int kh_Key_AllOwnedByWhichTeam()  // constantly called. check to see if all the keys are owned by the same team
 {
 	entity key;
-	float teem;
-	float keys;
-
-	teem = -1;
-	keys = kh_teams;
+	int teem = -1;
+	int keys = NumTeams(kh_teams);
 	FOR_EACH_KH_KEY(key)
 	{
 		if(!key.owner)
@@ -879,20 +798,20 @@ float kh_Key_AllOwnedByWhichTeam()  // constantly called. check to see if all th
 void kh_Key_DropOne(entity key)
 {
 	// prevent collecting this one for some time
-	entity player;
-	player = key.owner;
+	entity player = key.owner;
 
 	key.kh_droptime = time;
 	key.enemy = player;
 
 	kh_Scores_Event(player, key, "dropkey", 0, 0);
 	PlayerScore_Add(player, SP_KH_LOSSES, 1);
-	Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_DROP_), player.netname);
+	int realteam = kh_Team_ByID(key.count);
+	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_DROP), player.netname);
 
-	kh_Key_AssignTo(key, world);
+	kh_Key_AssignTo(key, NULL);
 	makevectors(player.v_angle);
-	key.velocity = W_CalculateProjectileVelocity(player.velocity, autocvar_g_balance_keyhunt_throwvelocity * v_forward, false);
-	key.pusher = world;
+	key.velocity = W_CalculateProjectileVelocity(player, player.velocity, autocvar_g_balance_keyhunt_throwvelocity * v_forward, false);
+	key.pusher = NULL;
 	key.pushltime = time + autocvar_g_balance_keyhunt_protecttime;
 	key.kh_dropperteam = key.team;
 
@@ -901,22 +820,23 @@ void kh_Key_DropOne(entity key)
 
 void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies
 {
-	entity key;
-	entity mypusher;
 	if(player.kh_next)
 	{
-		mypusher = world;
+		entity mypusher = NULL;
 		if(player.pusher)
 			if(time < player.pushltime)
 				mypusher = player.pusher;
+
+		entity key;
 		while((key = player.kh_next))
 		{
 			kh_Scores_Event(player, key, "losekey", 0, 0);
 			PlayerScore_Add(player, SP_KH_LOSSES, 1);
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_ENT_4(key, INFO_KEYHUNT_LOST_), player.netname);
-			kh_Key_AssignTo(key, world);
+			int realteam = kh_Team_ByID(key.count);
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(realteam, INFO_KEYHUNT_LOST), player.netname);
+			kh_Key_AssignTo(key, NULL);
 			makevectors('-1 0 0' * (45 + 45 * random()) + '0 360 0' * random());
-			key.velocity = W_CalculateProjectileVelocity(player.velocity, autocvar_g_balance_keyhunt_dropvelocity * v_forward, false);
+			key.velocity = W_CalculateProjectileVelocity(player, player.velocity, autocvar_g_balance_keyhunt_dropvelocity * v_forward, false);
 			key.pusher = mypusher;
 			key.pushltime = time + autocvar_g_balance_keyhunt_protecttime;
 			if(suicide)
@@ -926,42 +846,42 @@ void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies
 	}
 }
 
-float kh_CheckPlayers(float num)
+int kh_GetMissingTeams()
 {
-	if(num < kh_teams)
+	int missing_teams = 0;
+	for(int i = 0; i < NumTeams(kh_teams); ++i)
 	{
-		float t_team = kh_Team_ByID(num);
-		float players = 0;
-		entity tmp_player;
-		FOR_EACH_PLAYER(tmp_player)
-			if(tmp_player.deadflag == DEAD_NO)
-				if(!tmp_player.BUTTON_CHAT)
-					if(tmp_player.team == t_team)
-						++players;
-
-		if (!players) { return t_team; }
+		int teem = kh_Team_ByID(i);
+		int players = 0;
+		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+			if(!IS_DEAD(it) && !PHYS_INPUT_BUTTON_CHAT(it) && it.team == teem)
+				++players;
+		));
+		if (!players)
+			missing_teams |= pow(2, i);
 	}
-	return 0;
+	return missing_teams;
 }
 
-#define KH_READY_TEAMS() (!p1 + !p2 + ((kh_teams >= 3) ? !p3 : p3) + ((kh_teams >= 4) ? !p4 : p4))
-#define KH_READY_TEAMS_OK() (KH_READY_TEAMS() == kh_teams)
 void kh_WaitForPlayers()  // delay start of the round until enough players are present
 {
+	static int prev_missing_teams_mask;
 	if(time < game_starttime)
 	{
+		if (prev_missing_teams_mask > 0)
+			Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS);
+		prev_missing_teams_mask = -1;
 		kh_Controller_SetThink(game_starttime - time + 0.1, kh_WaitForPlayers);
 		return;
 	}
 
-	static float prev_missing_teams_mask;
-	float p1 = kh_CheckPlayers(0), p2 = kh_CheckPlayers(1), p3 = kh_CheckPlayers(2), p4 = kh_CheckPlayers(3);
-	if(KH_READY_TEAMS_OK())
+	int missing_teams_mask = kh_GetMissingTeams();
+	if(!missing_teams_mask)
 	{
 		if(prev_missing_teams_mask > 0)
-			Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS);
+			Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS);
 		prev_missing_teams_mask = -1;
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_KEYHUNT_ROUNDSTART, autocvar_g_balance_keyhunt_delay_round);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_KEYHUNT_ROUNDSTART, autocvar_g_balance_keyhunt_delay_round);
 		kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round, kh_StartRound);
 	}
 	else
@@ -969,17 +889,14 @@ void kh_WaitForPlayers()  // delay start of the round until enough players are p
 		if(player_count == 0)
 		{
 			if(prev_missing_teams_mask > 0)
-				Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_MISSING_TEAMS);
+				Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS);
 			prev_missing_teams_mask = -1;
 		}
 		else
 		{
-			float missing_teams_mask = (!!p1) + (!!p2) * 2;
-			if(kh_teams >= 3) missing_teams_mask += (!!p3) * 4;
-			if(kh_teams >= 4) missing_teams_mask += (!!p4) * 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;
 			}
 		}
@@ -989,52 +906,47 @@ void kh_WaitForPlayers()  // delay start of the round until enough players are p
 
 void kh_EnableTrackingDevice()  // runs after each round
 {
-	Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT);
-	Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT_OTHER);
+	Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_KEYHUNT);
+	Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_KEYHUNT_OTHER);
 
 	kh_tracking_enabled = true;
 }
 
 void kh_StartRound()  // runs at the start of each round
 {
-	float i, players, teem;
-	entity player;
-
 	if(time < game_starttime)
 	{
 		kh_Controller_SetThink(game_starttime - time + 0.1, kh_WaitForPlayers);
 		return;
 	}
 
-	float p1 = kh_CheckPlayers(0), p2 = kh_CheckPlayers(1), p3 = kh_CheckPlayers(2), p4 = kh_CheckPlayers(3);
-	if(!KH_READY_TEAMS_OK())
+	if(kh_GetMissingTeams())
 	{
 		kh_Controller_SetThink(1, kh_WaitForPlayers);
 		return;
 	}
 
-	Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT);
-	Kill_Notification(NOTIF_ALL, world, MSG_CENTER_CPID, CPID_KEYHUNT_OTHER);
+	Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_KEYHUNT);
+	Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_KEYHUNT_OTHER);
 
-	for(i = 0; i < kh_teams; ++i)
+	for(int i = 0; i < NumTeams(kh_teams); ++i)
 	{
-		teem = kh_Team_ByID(i);
-		players = 0;
-		entity my_player = world;
-		FOR_EACH_PLAYER(player)
-			if(player.deadflag == DEAD_NO)
-				if(!player.BUTTON_CHAT)
-					if(player.team == teem)
-					{
-						++players;
-						if(random() * players <= 1)
-							my_player = player;
-					}
-		kh_Key_Spawn(my_player, 360 * i / kh_teams, i);
+		int teem = kh_Team_ByID(i);
+		int players = 0;
+		entity my_player = NULL;
+		FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+			if(!IS_DEAD(it) && !PHYS_INPUT_BUTTON_CHAT(it) && it.team == teem)
+			{
+				++players;
+				if(random() * players <= 1)
+					my_player = it;
+			}
+		));
+		kh_Key_Spawn(my_player, 360 * i / NumTeams(kh_teams), i);
 	}
 
 	kh_tracking_enabled = false;
-	Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_KEYHUNT_SCAN, autocvar_g_balance_keyhunt_delay_tracking);
+	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_KEYHUNT_SCAN, autocvar_g_balance_keyhunt_delay_tracking);
 	kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_tracking, kh_EnableTrackingDevice);
 }
 
@@ -1047,10 +959,8 @@ float kh_HandleFrags(entity attacker, entity targ, float f)  // adds to the play
 	{
 		if(attacker.team == targ.team)
 		{
-			entity k;
-			float nk;
-			nk = 0;
-			for(k = targ.kh_next; k != world; k = k.kh_next)
+			int nk = 0;
+			for(entity k = targ.kh_next; k != NULL; k = k.kh_next)
 				++nk;
 			kh_Scores_Event(attacker, targ.kh_next, "carrierfrag", -nk * autocvar_g_balance_keyhunt_score_collect, 0);
 		}
@@ -1070,12 +980,20 @@ void kh_Initialize()  // sets up th KH environment
 	// setup variables
 	kh_teams = autocvar_g_keyhunt_teams_override;
 	if(kh_teams < 2)
-		kh_teams = autocvar_g_keyhunt_teams;
+		kh_teams = cvar("g_keyhunt_teams"); // read the cvar directly as it gets written earlier in the same frame
 	kh_teams = bound(2, kh_teams, 4);
 
+	int teams = 0;
+	if(kh_teams >= 1) teams |= BIT(0);
+	if(kh_teams >= 2) teams |= BIT(1);
+	if(kh_teams >= 3) teams |= BIT(2);
+	if(kh_teams >= 4) teams |= BIT(3);
+
+	kh_teams = teams; // now set it?
+
 	// make a KH entity for controlling the game
 	kh_controller = spawn();
-	kh_controller.think = kh_Controller_Think;
+	setthink(kh_controller, kh_Controller_Think);
 	kh_Controller_SetThink(0, kh_WaitForPlayers);
 
 	setmodel(kh_controller, MDL_KH_KEY);
@@ -1095,8 +1013,6 @@ void kh_Initialize()  // sets up th KH environment
 	kh_controller.model = "";
 	kh_controller.modelindex = 0;
 
-	addstat(STAT_KH_KEYS, AS_INT, kh_state);
-
 	kh_ScoreRules(kh_teams);
 }
 
@@ -1104,204 +1020,202 @@ void kh_finalize()
 {
 	// to be called before intermission
 	kh_FinishRound();
-	remove(kh_controller);
-	kh_controller = world;
+	delete(kh_controller);
+	kh_controller = NULL;
 }
 
 // legacy bot role
 
-void() havocbot_role_kh_carrier;
-void() havocbot_role_kh_defense;
-void() havocbot_role_kh_offense;
-void() havocbot_role_kh_freelancer;
+void(entity this) havocbot_role_kh_carrier;
+void(entity this) havocbot_role_kh_defense;
+void(entity this) havocbot_role_kh_offense;
+void(entity this) havocbot_role_kh_freelancer;
 
 
-void havocbot_goalrating_kh(float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy)
-{SELFPARAM();
+void havocbot_goalrating_kh(entity this, float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy)
+{
 	entity head;
 	for (head = kh_worldkeylist; head; head = head.kh_worldkeynext)
 	{
-		if(head.owner == self)
+		if(head.owner == this)
 			continue;
 		if(!kh_tracking_enabled)
 		{
 			// if it's carried by our team we know about it
 			// otherwise we have to see it to know about it
-			if(!head.owner || head.team != self.team)
+			if(!head.owner || head.team != this.team)
 			{
-				traceline(self.origin + self.view_ofs, head.origin, MOVE_NOMONSTERS, self);
+				traceline(this.origin + this.view_ofs, head.origin, MOVE_NOMONSTERS, this);
 				if (trace_fraction < 1 && trace_ent != head)
 					continue; // skip what I can't see
 			}
 		}
 		if(!head.owner)
-			navigation_routerating(head, ratingscale_dropped * BOT_PICKUP_RATING_HIGH, 100000);
-		else if(head.team == self.team)
-			navigation_routerating(head.owner, ratingscale_team * BOT_PICKUP_RATING_HIGH, 100000);
+			navigation_routerating(this, head, ratingscale_dropped * BOT_PICKUP_RATING_HIGH, 100000);
+		else if(head.team == this.team)
+			navigation_routerating(this, head.owner, ratingscale_team * BOT_PICKUP_RATING_HIGH, 100000);
 		else
-			navigation_routerating(head.owner, ratingscale_enemy * BOT_PICKUP_RATING_HIGH, 100000);
+			navigation_routerating(this, head.owner, ratingscale_enemy * BOT_PICKUP_RATING_HIGH, 100000);
 	}
 
-	havocbot_goalrating_items(1, self.origin, 10000);
+	havocbot_goalrating_items(this, 1, this.origin, 10000);
 }
 
-void havocbot_role_kh_carrier()
-{SELFPARAM();
-	if(self.deadflag != DEAD_NO)
+void havocbot_role_kh_carrier(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (!(self.kh_next))
+	if (!(this.kh_next))
 	{
-		LOG_TRACE("changing role to freelancer\n");
-		self.havocbot_role = havocbot_role_kh_freelancer;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to freelancer");
+		this.havocbot_role = havocbot_role_kh_freelancer;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (self.bot_strategytime < time)
+	if (this.bot_strategytime < time)
 	{
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+		navigation_goalrating_start(this);
 
-		if(kh_Key_AllOwnedByWhichTeam() == self.team)
-			havocbot_goalrating_kh(10, 0.1, 0.1); // bring home
+		if(kh_Key_AllOwnedByWhichTeam() == this.team)
+			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // bring home
 		else
-			havocbot_goalrating_kh(4, 4, 1); // play defensively
+			havocbot_goalrating_kh(this, 4, 4, 1); // play defensively
 
-		navigation_goalrating_end();
+		navigation_goalrating_end(this);
 	}
 }
 
-void havocbot_role_kh_defense()
-{SELFPARAM();
-	if(self.deadflag != DEAD_NO)
+void havocbot_role_kh_defense(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (self.kh_next)
+	if (this.kh_next)
 	{
-		LOG_TRACE("changing role to carrier\n");
-		self.havocbot_role = havocbot_role_kh_carrier;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to carrier");
+		this.havocbot_role = havocbot_role_kh_carrier;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (!self.havocbot_role_timeout)
-		self.havocbot_role_timeout = time + random() * 10 + 20;
-	if (time > self.havocbot_role_timeout)
+	if (!this.havocbot_role_timeout)
+		this.havocbot_role_timeout = time + random() * 10 + 20;
+	if (time > this.havocbot_role_timeout)
 	{
-		LOG_TRACE("changing role to freelancer\n");
-		self.havocbot_role = havocbot_role_kh_freelancer;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to freelancer");
+		this.havocbot_role = havocbot_role_kh_freelancer;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (self.bot_strategytime < time)
+	if (this.bot_strategytime < time)
 	{
 		float key_owner_team;
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+		navigation_goalrating_start(this);
 
 		key_owner_team = kh_Key_AllOwnedByWhichTeam();
-		if(key_owner_team == self.team)
-			havocbot_goalrating_kh(10, 0.1, 0.1); // defend key carriers
+		if(key_owner_team == this.team)
+			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend key carriers
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(4, 1, 0.1); // play defensively
+			havocbot_goalrating_kh(this, 4, 1, 0.1); // play defensively
 		else
-			havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY
+			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY
 
-		navigation_goalrating_end();
+		navigation_goalrating_end(this);
 	}
 }
 
-void havocbot_role_kh_offense()
-{SELFPARAM();
-	if(self.deadflag != DEAD_NO)
+void havocbot_role_kh_offense(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (self.kh_next)
+	if (this.kh_next)
 	{
-		LOG_TRACE("changing role to carrier\n");
-		self.havocbot_role = havocbot_role_kh_carrier;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to carrier");
+		this.havocbot_role = havocbot_role_kh_carrier;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (!self.havocbot_role_timeout)
-		self.havocbot_role_timeout = time + random() * 10 + 20;
-	if (time > self.havocbot_role_timeout)
+	if (!this.havocbot_role_timeout)
+		this.havocbot_role_timeout = time + random() * 10 + 20;
+	if (time > this.havocbot_role_timeout)
 	{
-		LOG_TRACE("changing role to freelancer\n");
-		self.havocbot_role = havocbot_role_kh_freelancer;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to freelancer");
+		this.havocbot_role = havocbot_role_kh_freelancer;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (self.bot_strategytime < time)
+	if (this.bot_strategytime < time)
 	{
 		float key_owner_team;
 
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+		navigation_goalrating_start(this);
 
 		key_owner_team = kh_Key_AllOwnedByWhichTeam();
-		if(key_owner_team == self.team)
-			havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway
+		if(key_owner_team == this.team)
+			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(0.1, 1, 4); // play offensively
+			havocbot_goalrating_kh(this, 0.1, 1, 4); // play offensively
 		else
-			havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK! EMERGENCY!
+			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK! EMERGENCY!
 
-		navigation_goalrating_end();
+		navigation_goalrating_end(this);
 	}
 }
 
-void havocbot_role_kh_freelancer()
-{SELFPARAM();
-	if(self.deadflag != DEAD_NO)
+void havocbot_role_kh_freelancer(entity this)
+{
+	if(IS_DEAD(this))
 		return;
 
-	if (self.kh_next)
+	if (this.kh_next)
 	{
-		LOG_TRACE("changing role to carrier\n");
-		self.havocbot_role = havocbot_role_kh_carrier;
-		self.havocbot_role_timeout = 0;
+		LOG_TRACE("changing role to carrier");
+		this.havocbot_role = havocbot_role_kh_carrier;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (!self.havocbot_role_timeout)
-		self.havocbot_role_timeout = time + random() * 10 + 10;
-	if (time > self.havocbot_role_timeout)
+	if (!this.havocbot_role_timeout)
+		this.havocbot_role_timeout = time + random() * 10 + 10;
+	if (time > this.havocbot_role_timeout)
 	{
 		if (random() < 0.5)
 		{
-			LOG_TRACE("changing role to offense\n");
-			self.havocbot_role = havocbot_role_kh_offense;
+			LOG_TRACE("changing role to offense");
+			this.havocbot_role = havocbot_role_kh_offense;
 		}
 		else
 		{
-			LOG_TRACE("changing role to defense\n");
-			self.havocbot_role = havocbot_role_kh_defense;
+			LOG_TRACE("changing role to defense");
+			this.havocbot_role = havocbot_role_kh_defense;
 		}
-		self.havocbot_role_timeout = 0;
+		this.havocbot_role_timeout = 0;
 		return;
 	}
 
-	if (self.bot_strategytime < time)
+	if (this.bot_strategytime < time)
 	{
-		float key_owner_team;
+		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+		navigation_goalrating_start(this);
 
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
-
-		key_owner_team = kh_Key_AllOwnedByWhichTeam();
-		if(key_owner_team == self.team)
-			havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway
+		int key_owner_team = kh_Key_AllOwnedByWhichTeam();
+		if(key_owner_team == this.team)
+			havocbot_goalrating_kh(this, 10, 0.1, 0.1); // defend anyway
 		else if(key_owner_team == -1)
-			havocbot_goalrating_kh(1, 10, 4); // prefer dropped keys
+			havocbot_goalrating_kh(this, 1, 10, 4); // prefer dropped keys
 		else
-			havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY
+			havocbot_goalrating_kh(this, 0.1, 0.1, 10); // ATTACK ANYWAY
 
-		navigation_goalrating_end();
+		navigation_goalrating_end(this);
 	}
 }
 
@@ -1309,93 +1223,99 @@ void havocbot_role_kh_freelancer()
 // register this as a mutator
 
 MUTATOR_HOOKFUNCTION(kh, ClientDisconnect)
-{SELFPARAM();
-	kh_Key_DropAll(self, true);
-	return 0;
+{
+	entity player = M_ARGV(0, entity);
+
+	kh_Key_DropAll(player, true);
 }
 
 MUTATOR_HOOKFUNCTION(kh, MakePlayerObserver)
-{SELFPARAM();
-	kh_Key_DropAll(self, true);
-	return 0;
+{
+	entity player = M_ARGV(0, entity);
+
+	kh_Key_DropAll(player, true);
 }
 
 MUTATOR_HOOKFUNCTION(kh, PlayerDies)
-{SELFPARAM();
-	if(self == other)
-		kh_Key_DropAll(self, true);
-	else if(IS_PLAYER(other))
-		kh_Key_DropAll(self, false);
+{
+	entity frag_attacker = M_ARGV(1, entity);
+	entity frag_target = M_ARGV(2, entity);
+
+	if(frag_target == frag_attacker)
+		kh_Key_DropAll(frag_target, true);
+	else if(IS_PLAYER(frag_attacker))
+		kh_Key_DropAll(frag_target, false);
 	else
-		kh_Key_DropAll(self, true);
-	return 0;
+		kh_Key_DropAll(frag_target, true);
 }
 
 MUTATOR_HOOKFUNCTION(kh, GiveFragsForKill, CBC_ORDER_FIRST)
 {
-	frag_score = kh_HandleFrags(frag_attacker, frag_target, frag_score);
-	return 0;
+	entity frag_attacker = M_ARGV(0, entity);
+	entity frag_target = M_ARGV(1, entity);
+	float frag_score = M_ARGV(2, float);
+	M_ARGV(2, float) = kh_HandleFrags(frag_attacker, frag_target, frag_score);
 }
 
 MUTATOR_HOOKFUNCTION(kh, MatchEnd)
 {
 	kh_finalize();
-	return 0;
 }
 
-MUTATOR_HOOKFUNCTION(kh, GetTeamCount, CBC_ORDER_EXCLUSIVE)
+MUTATOR_HOOKFUNCTION(kh, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
 {
-	ret_float = kh_teams;
-	return false;
+	M_ARGV(0, float) = kh_teams;
 }
 
 MUTATOR_HOOKFUNCTION(kh, SpectateCopy)
-{SELFPARAM();
-	self.kh_state = other.kh_state;
-	return 0;
+{
+	entity spectatee = M_ARGV(0, entity);
+	entity client = M_ARGV(1, entity);
+
+	client.kh_state = spectatee.kh_state;
 }
 
 MUTATOR_HOOKFUNCTION(kh, PlayerUseKey)
-{SELFPARAM();
+{
+	entity player = M_ARGV(0, entity);
+
 	if(MUTATOR_RETURNVALUE == 0)
 	{
-		entity k;
-		k = self.kh_next;
+		entity k = player.kh_next;
 		if(k)
 		{
 			kh_Key_DropOne(k);
-			return 1;
+			return true;
 		}
 	}
-	return 0;
 }
 
 MUTATOR_HOOKFUNCTION(kh, HavocBot_ChooseRole)
 {
-	if(self.deadflag != DEAD_NO)
+    entity bot = M_ARGV(0, entity);
+
+	if(IS_DEAD(bot))
 		return true;
 
 	float r = random() * 3;
 	if (r < 1)
-		self.havocbot_role = havocbot_role_kh_offense;
+		bot.havocbot_role = havocbot_role_kh_offense;
 	else if (r < 2)
-		self.havocbot_role = havocbot_role_kh_defense;
+		bot.havocbot_role = havocbot_role_kh_defense;
 	else
-		self.havocbot_role = havocbot_role_kh_freelancer;
+		bot.havocbot_role = havocbot_role_kh_freelancer;
 
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(kh, DropSpecialItems)
 {
+	entity frag_target = M_ARGV(0, entity);
+
 	kh_Key_DropAll(frag_target, false);
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(kh, reset_map_global)
 {
-	kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round + (game_starttime - time), kh_StartRound);
-	return false;
+	kh_WaitForPlayers(); // takes care of killing the "missing teams" message
 }
-
-#endif