X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_race.qc;h=3db96f75444c8573a681e61dc4533256a6635eb3;hp=fc87ae9793ae29999bde64967800661c8eb6712f;hb=13e8382b4bd9c0de8bcfd2a96f56e638ba5d431d;hpb=74cebbb48d9481bb83eccb4438283f319352cb74

diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index fc87ae979..690d23ca8 100644
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -1,42 +1,5 @@
 #include "gamemode_race.qh"
 
-#ifndef GAMEMODE_RACE_H
-#define GAMEMODE_RACE_H
-
-void rc_SetLimits();
-void race_Initialize();
-
-REGISTER_MUTATOR(rc, false)
-{
-	MUTATOR_ONADD
-	{
-		if (time > 1) // game loads at time 1
-			error("This is a game type and it cannot be added at runtime.");
-
-		rc_SetLimits();
-		race_Initialize();
-	}
-
-	MUTATOR_ONROLLBACK_OR_REMOVE
-	{
-		// we actually cannot roll back race_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;
-}
-
-#endif
-
-#ifdef IMPLEMENTATION
-
 #include <server/race.qh>
 
 #define autocvar_g_race_laps_limit cvar("g_race_laps_limit")
@@ -51,55 +14,59 @@ void havocbot_role_race(entity this)
 	if(IS_DEAD(this))
 		return;
 
-	entity e;
-	if (this.bot_strategytime < time)
+	if (navigation_goalrating_timeout(this))
 	{
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
 		navigation_goalrating_start(this);
 
-		for(e = world; (e = find(e, classname, "trigger_race_checkpoint")) != world; )
+		bool raw_touch_check = true;
+		int cp = this.race_checkpoint;
+
+		LABEL(search_racecheckpoints)
+		IL_EACH(g_racecheckpoints, true,
 		{
-			if(e.cnt == this.race_checkpoint)
-			{
-				navigation_routerating(this, e, 1000000, 5000);
-			}
-			else if(this.race_checkpoint == -1)
+			if(it.cnt == cp || cp == -1)
 			{
-				navigation_routerating(this, e, 1000000, 5000);
-			}
-		}
+				// redirect bot to next goal if it touched the waypoint of an untouchable checkpoint
+				// e.g. checkpoint in front of Stormkeep's warpzone
+				// the same workaround is applied in CTS game mode
+				if (raw_touch_check && vdist(this.origin - it.nearestwaypoint.origin, <, 30))
+				{
+					cp = race_NextCheckpoint(cp);
+					raw_touch_check = false;
+					goto search_racecheckpoints;
+				}
+				navigation_routerating(this, it, 1000000, 5000);
+		});
 
 		navigation_goalrating_end(this);
+
+		navigation_goalrating_timeout_set(this);
 	}
 }
 
 void race_ScoreRules()
 {
-	ScoreRules_basics(race_teams, 0, 0, false);
-	if(race_teams)
-	{
-		ScoreInfo_SetLabel_TeamScore(  ST_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_TIME,    "time",      SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	else if(g_race_qualifying)
-	{
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	else
-	{
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_LAPS,    "laps",      SFL_SORT_PRIO_PRIMARY);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_TIME,    "time",      SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
-		ScoreInfo_SetLabel_PlayerScore(SP_RACE_FASTEST, "fastest",   SFL_LOWER_IS_BETTER | SFL_TIME);
-	}
-	ScoreRules_basics_end();
+    GameRules_score_enabled(false);
+	GameRules_scoring(race_teams, 0, 0, {
+        if (race_teams) {
+            field_team(ST_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_TIME, "time", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+            field(SP_RACE_FASTEST, "fastest", SFL_LOWER_IS_BETTER | SFL_TIME);
+        } else if (g_race_qualifying) {
+            field(SP_RACE_FASTEST, "fastest", SFL_SORT_PRIO_PRIMARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+        } else {
+            field(SP_RACE_LAPS, "laps", SFL_SORT_PRIO_PRIMARY);
+            field(SP_RACE_TIME, "time", SFL_SORT_PRIO_SECONDARY | SFL_LOWER_IS_BETTER | SFL_TIME);
+            field(SP_RACE_FASTEST, "fastest", SFL_LOWER_IS_BETTER | SFL_TIME);
+        }
+	});
 }
 
 void race_EventLog(string mode, entity actor) // use an alias for easy changing and quick editing later
 {
 	if(autocvar_sv_eventlog)
-		GameLogEcho(strcat(":race:", mode, ":", ((actor != world) ? (strcat(":", ftos(actor.playerid))) : "")));
+		GameLogEcho(strcat(":race:", mode, ":", ((actor != NULL) ? (strcat(":", ftos(actor.playerid))) : "")));
 }
 
 float WinningCondition_Race(float fraglimit)
@@ -109,11 +76,11 @@ float WinningCondition_Race(float fraglimit)
 
 	n = 0;
 	c = 0;
-	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+	FOREACH_CLIENT(IS_PLAYER(it), {
 		++n;
-		if(it.race_completed)
+		if(CS(it).race_completed)
 			++c;
-	));
+	});
 	if(n && (n == c))
 		return WINNING_YES;
 	wc = WinningCondition_Scores(fraglimit, 0);
@@ -140,25 +107,42 @@ float WinningCondition_QualifyingThenRace(float limit)
 	return wc;
 }
 
+MUTATOR_HOOKFUNCTION(rc, ClientKill)
+{
+	if(g_race_qualifying)
+		M_ARGV(1, float) = 0; // killtime
+}
+
+MUTATOR_HOOKFUNCTION(rc, AbortSpeedrun)
+{
+	entity player = M_ARGV(0, entity);
+
+	if(autocvar_g_allow_checkpoints)
+		race_PreparePlayer(player); // nice try
+}
+
 MUTATOR_HOOKFUNCTION(rc, PlayerPhysics)
-{SELFPARAM();
-	self.race_movetime_frac += PHYS_INPUT_TIMELENGTH;
-	float f = floor(self.race_movetime_frac);
-	self.race_movetime_frac -= f;
-	self.race_movetime_count += f;
-	self.race_movetime = self.race_movetime_frac + self.race_movetime_count;
+{
+	entity player = M_ARGV(0, entity);
+	float dt = M_ARGV(1, float);
+
+	player.race_movetime_frac += dt;
+	float f = floor(player.race_movetime_frac);
+	player.race_movetime_frac -= f;
+	player.race_movetime_count += f;
+	player.race_movetime = player.race_movetime_frac + player.race_movetime_count;
 
 #ifdef SVQC
-	if(IS_PLAYER(self))
+	if(IS_PLAYER(player))
 	{
-		if (self.race_penalty)
-			if (time > self.race_penalty)
-				self.race_penalty = 0;
-		if(self.race_penalty)
+		if (player.race_penalty)
+			if (time > player.race_penalty)
+				player.race_penalty = 0;
+		if(player.race_penalty)
 		{
-			self.velocity = '0 0 0';
-			self.movetype = MOVETYPE_NONE;
-			self.disableclientprediction = 2;
+			player.velocity = '0 0 0';
+			set_movetype(player, MOVETYPE_NONE);
+			player.disableclientprediction = 2;
 		}
 	}
 #endif
@@ -171,8 +155,8 @@ MUTATOR_HOOKFUNCTION(rc, PlayerPhysics)
 	// ensure nothing EVIL is being done (i.e. div0_evade)
 	// this hinders joystick users though
 	// but it still gives SOME analog control
-	wishvel.x = fabs(self.movement.x);
-	wishvel.y = fabs(self.movement.y);
+	wishvel.x = fabs(CS(player).movement.x);
+	wishvel.y = fabs(CS(player).movement.y);
 	if(wishvel.x != 0 && wishvel.y != 0 && wishvel.x != wishvel.y)
 	{
 		wishvel.z = 0;
@@ -180,56 +164,54 @@ MUTATOR_HOOKFUNCTION(rc, PlayerPhysics)
 		if(wishvel.x >= 2 * wishvel.y)
 		{
 			// pure X motion
-			if(self.movement.x > 0)
-				self.movement_x = wishspeed;
+			if(CS(player).movement.x > 0)
+				CS(player).movement_x = wishspeed;
 			else
-				self.movement_x = -wishspeed;
-			self.movement_y = 0;
+				CS(player).movement_x = -wishspeed;
+			CS(player).movement_y = 0;
 		}
 		else if(wishvel.y >= 2 * wishvel.x)
 		{
 			// pure Y motion
-			self.movement_x = 0;
-			if(self.movement.y > 0)
-				self.movement_y = wishspeed;
+			CS(player).movement_x = 0;
+			if(CS(player).movement.y > 0)
+				CS(player).movement_y = wishspeed;
 			else
-				self.movement_y = -wishspeed;
+				CS(player).movement_y = -wishspeed;
 		}
 		else
 		{
 			// diagonal
-			if(self.movement.x > 0)
-				self.movement_x = M_SQRT1_2 * wishspeed;
+			if(CS(player).movement.x > 0)
+				CS(player).movement_x = M_SQRT1_2 * wishspeed;
 			else
-				self.movement_x = -M_SQRT1_2 * wishspeed;
-			if(self.movement.y > 0)
-				self.movement_y = M_SQRT1_2 * wishspeed;
+				CS(player).movement_x = -M_SQRT1_2 * wishspeed;
+			if(CS(player).movement.y > 0)
+				CS(player).movement_y = M_SQRT1_2 * wishspeed;
 			else
-				self.movement_y = -M_SQRT1_2 * wishspeed;
+				CS(player).movement_y = -M_SQRT1_2 * wishspeed;
 		}
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, reset_map_global)
 {
 	float s;
 
-	Score_NicePrint(world);
+	Score_NicePrint(NULL);
 
 	race_ClearRecords();
 	PlayerScore_Sort(race_place, 0, 1, 0);
 
-	FOREACH_CLIENT(true, LAMBDA(
+	FOREACH_CLIENT(true, {
 		if(it.race_place)
 		{
-			s = PlayerScore_Add(it, SP_RACE_FASTEST, 0);
+			s = GameRules_scoring_add(it, RACE_FASTEST, 0);
 			if(!s)
 				it.race_place = 0;
 		}
 		race_EventLog(ftos(it.race_place), it);
-	));
+	});
 
 	if(g_race_qualifying == 2)
 	{
@@ -240,20 +222,20 @@ MUTATOR_HOOKFUNCTION(rc, reset_map_global)
 		cvar_set("timelimit", ftos(race_timelimit));
 		race_ScoreRules();
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, ClientConnect)
-{SELFPARAM();
-	race_PreparePlayer(this);
-	self.race_checkpoint = -1;
+{
+	entity player = M_ARGV(0, entity);
+
+	race_PreparePlayer(player);
+	player.race_checkpoint = -1;
 
 	string rr = RACE_RECORD;
 
-	if(IS_REAL_CLIENT(self))
+	if(IS_REAL_CLIENT(player))
 	{
-		msg_entity = self;
+		msg_entity = player;
 		race_send_recordtime(MSG_ONE);
 		race_send_speedaward(MSG_ONE);
 
@@ -267,88 +249,93 @@ MUTATOR_HOOKFUNCTION(rc, ClientConnect)
 			race_SendRankings(i, 0, 0, MSG_ONE);
 		}
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, MakePlayerObserver)
-{SELFPARAM();
+{
+	entity player = M_ARGV(0, entity);
+
 	if(g_race_qualifying)
-	if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
-		self.frags = FRAGS_LMS_LOSER;
+	if(GameRules_scoring_add(player, RACE_FASTEST, 0))
+		player.frags = FRAGS_LMS_LOSER;
 	else
-		self.frags = FRAGS_SPECTATOR;
-
-	race_PreparePlayer(this);
-	self.race_checkpoint = -1;
+		player.frags = FRAGS_SPECTATOR;
 
-	return false;
+	race_PreparePlayer(player);
+	player.race_checkpoint = -1;
 }
 
 MUTATOR_HOOKFUNCTION(rc, PlayerSpawn)
-{SELFPARAM();
+{
+	entity player = M_ARGV(0, entity);
+	entity spawn_spot = M_ARGV(1, entity);
+
 	if(spawn_spot.target == "")
 		// Emergency: this wasn't a real spawnpoint. Can this ever happen?
-		race_PreparePlayer(this);
+		race_PreparePlayer(player);
 
 	// if we need to respawn, do it right
-	self.race_respawn_checkpoint = self.race_checkpoint;
-	self.race_respawn_spotref = spawn_spot;
+	player.race_respawn_checkpoint = player.race_checkpoint;
+	player.race_respawn_spotref = spawn_spot;
 
-	self.race_place = 0;
-
-	return false;
+	player.race_place = 0;
 }
 
 MUTATOR_HOOKFUNCTION(rc, PutClientInServer)
-{SELFPARAM();
-	if(IS_PLAYER(self))
-	if(!gameover)
+{
+	entity player = M_ARGV(0, entity);
+
+	if(IS_PLAYER(player))
+	if(!game_stopped)
 	{
-		if(self.killcount == FRAGS_SPECTATOR /* initial spawn */ || g_race_qualifying) // spawn
-			race_PreparePlayer(this);
+		if(CS(player).killcount == FRAGS_SPECTATOR /* initial spawn */ || g_race_qualifying) // spawn
+			race_PreparePlayer(player);
 		else // respawn
-			race_RetractPlayer(this);
+			race_RetractPlayer(player);
 
-		race_AbandonRaceCheck(self);
+		race_AbandonRaceCheck(player);
 	}
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, PlayerDies)
 {
+	entity frag_target = M_ARGV(2, entity);
+
 	frag_target.respawn_flags |= RESPAWN_FORCE;
 	race_AbandonRaceCheck(frag_target);
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, HavocBot_ChooseRole)
-{SELFPARAM();
-	self.havocbot_role = havocbot_role_race;
+{
+	entity bot = M_ARGV(0, entity);
+
+	bot.havocbot_role = havocbot_role_race;
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(rc, GetPressedKeys)
-{SELFPARAM();
-	if(self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)
+{
+	entity player = M_ARGV(0, entity);
+
+	if(CS(player).cvar_cl_allow_uidtracking == 1 && CS(player).cvar_cl_allow_uid2name == 1)
 	{
-		if (!self.stored_netname)
-			self.stored_netname = strzone(uid2name(self.crypto_idfp));
-		if(self.stored_netname != self.netname)
+		if (!player.stored_netname)
+			player.stored_netname = strzone(uid2name(player.crypto_idfp));
+		if(player.stored_netname != player.netname)
 		{
-			db_put(ServerProgsDB, strcat("/uid2name/", self.crypto_idfp), self.netname);
-			strunzone(self.stored_netname);
-			self.stored_netname = strzone(self.netname);
+			db_put(ServerProgsDB, strcat("/uid2name/", player.crypto_idfp), player.netname);
+			strunzone(player.stored_netname);
+			player.stored_netname = strzone(player.netname);
 		}
 	}
 
-	if (!IS_OBSERVER(self))
+	if (!IS_OBSERVER(player))
 	{
-		if (vlen(self.velocity - self.velocity_z * '0 0 1') > speedaward_speed)
+		if(vdist(player.velocity - player.velocity_z * '0 0 1', >, speedaward_speed))
 		{
-			speedaward_speed = vlen(self.velocity - self.velocity_z * '0 0 1');
-			speedaward_holder = self.netname;
-			speedaward_uid = self.crypto_idfp;
+			speedaward_speed = vlen(player.velocity - player.velocity_z * '0 0 1');
+			speedaward_holder = player.netname;
+			speedaward_uid = player.crypto_idfp;
 			speedaward_lastupdate = time;
 		}
 		if (speedaward_speed > speedaward_lastsent && time - speedaward_lastupdate > 1)
@@ -367,21 +354,17 @@ MUTATOR_HOOKFUNCTION(rc, GetPressedKeys)
 			}
 		}
 	}
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, ForbidPlayerScore_Clear)
 {
 	if(g_race_qualifying)
 		return true; // in qualifying, you don't lose score by observing
-
-	return false;
 }
 
-MUTATOR_HOOKFUNCTION(rc, GetTeamCount, CBC_ORDER_EXCLUSIVE)
+MUTATOR_HOOKFUNCTION(rc, CheckAllowedTeams, CBC_ORDER_EXCLUSIVE)
 {
-	ret_float = race_teams;
-	return false;
+	M_ARGV(0, float) = race_teams;
 }
 
 MUTATOR_HOOKFUNCTION(rc, Scores_CountFragsRemaining)
@@ -389,12 +372,13 @@ MUTATOR_HOOKFUNCTION(rc, Scores_CountFragsRemaining)
 	// announce remaining frags if not in qualifying mode
 	if(!g_race_qualifying)
 		return true;
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, GetRecords)
 {
+	int record_page = M_ARGV(0, int);
+	string ret_string = M_ARGV(1, string);
+
 	for(int i = record_page * 200; i < MapInfo_count && i < record_page * 200 + 200; ++i)
 	{
 		if(MapInfo_Get_ByID(i))
@@ -409,39 +393,45 @@ MUTATOR_HOOKFUNCTION(rc, GetRecords)
 		}
 	}
 
-	return false;
+	M_ARGV(1, string) = ret_string;
+}
+
+MUTATOR_HOOKFUNCTION(rc, HideTeamNagger)
+{
+	return true; // doesn't work so well
 }
 
 MUTATOR_HOOKFUNCTION(rc, FixClientCvars)
 {
-	stuffcmd(fix_client, "cl_cmd settemp cl_movecliptokeyboard 2\n");
-	return false;
+	entity player = M_ARGV(0, entity);
+
+	stuffcmd(player, "cl_cmd settemp cl_movecliptokeyboard 2\n");
 }
 
 MUTATOR_HOOKFUNCTION(rc, CheckRules_World)
 {
+	float checkrules_timelimit = M_ARGV(1, float);
+	float checkrules_fraglimit = M_ARGV(2, float);
+
 	if(checkrules_timelimit >= 0)
 	{
 		if(!g_race_qualifying)
 		{
-			ret_float = WinningCondition_Race(checkrules_fraglimit);
+			M_ARGV(0, float) = WinningCondition_Race(checkrules_fraglimit);
 			return true;
 		}
 		else if(g_race_qualifying == 2)
 		{
-			ret_float = WinningCondition_QualifyingThenRace(checkrules_fraglimit);
+			M_ARGV(0, float) = WinningCondition_QualifyingThenRace(checkrules_fraglimit);
 			return true;
 		}
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(rc, ReadLevelCvars)
 {
 	if(g_race_qualifying == 2)
 		warmup_stage = 0;
-	return false;
 }
 
 void race_Initialize()
@@ -458,9 +448,8 @@ void rc_SetLimits()
 
 	if(autocvar_g_race_teams)
 	{
-		ActivateTeamplay();
-		race_teams = bound(2, autocvar_g_race_teams, 4);
-		have_team_spawns = -1; // request team spawns
+		GameRules_teams(true);
+		race_teams = BITS(bound(2, autocvar_g_race_teams, 4));
 	}
 	else
 		race_teams = 0;
@@ -491,7 +480,8 @@ void rc_SetLimits()
 	}
 	else
 		g_race_qualifying = 0;
-	SetLimits(fraglimit_override, leadlimit_override, timelimit_override, qualifying_override);
+    GameRules_limit_score(fraglimit_override);
+    GameRules_limit_lead(leadlimit_override);
+    GameRules_limit_time(timelimit_override);
+    GameRules_limit_time_qualifying(qualifying_override);
 }
-
-#endif