X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_cts.qc;h=1363411aa9e75c7f388aad0439b6e7ef1abc2371;hb=89f405ba71d1c354dca27a0af246f04fb9ec42e6;hp=ca892c52ff538c59f2205bf25d1090ed48ddf1bc;hpb=5c9f51cd3a9f0b63733ee7b81649e81872a86765;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_cts.qc b/qcsrc/server/mutators/mutator/gamemode_cts.qc
index ca892c52f..1363411aa 100644
--- a/qcsrc/server/mutators/mutator/gamemode_cts.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_cts.qc
@@ -13,20 +13,34 @@ void havocbot_role_cts(entity this)
 	if(IS_DEAD(this))
 		return;
 
-	if (this.bot_strategytime < time)
+	if (navigation_goalrating_timeout(this))
 	{
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
 		navigation_goalrating_start(this);
 
+		bool raw_touch_check = true;
+		int cp = this.race_checkpoint;
+
+		LABEL(search_racecheckpoints)
 		IL_EACH(g_racecheckpoints, true,
 		{
-			if(it.cnt == this.race_checkpoint)
-				navigation_routerating(this, it, 1000000, 5000);
-			else if(this.race_checkpoint == -1)
+			if(it.cnt == cp || cp == -1)
+			{
+				// 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 Race 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);
 	}
 }
 
@@ -272,8 +286,7 @@ MUTATOR_HOOKFUNCTION(cts, GetPressedKeys)
 		if(player.stored_netname != player.netname)
 		{
 			db_put(ServerProgsDB, strcat("/uid2name/", player.crypto_idfp), player.netname);
-			strunzone(player.stored_netname);
-			player.stored_netname = strzone(player.netname);
+			strcpy(player.stored_netname, player.netname);
 		}
 	}