From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Apr 2022 19:56:27 +0000 (+0200)
Subject: Fix g_race_qualifying type assignments. Make "???" (missing campaign title) not trans... 
X-Git-Tag: xonotic-v0.8.5~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3de013c2d9c4517c511c9aaf4fb353b7219a9e0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix g_race_qualifying type assignments. Make "???" (missing campaign title) not translatable
---

diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh
index 8c8453d76..371f7a250 100644
--- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh
+++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh
@@ -10,7 +10,7 @@ REGISTER_MUTATOR(cts, false)
     MUTATOR_STATIC();
 	MUTATOR_ONADD
 	{
-		g_race_qualifying = true;
+		g_race_qualifying = 1;
 		independent_players = 1;
         GameRules_limit_score(0);
         GameRules_limit_lead(0);
diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc
index 57184dc00..ded656605 100644
--- a/qcsrc/menu/xonotic/dialog_singleplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc
@@ -153,7 +153,7 @@ void XonoticSingleplayerDialog_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, btnPrev = makeXonoticButton("<<", '0 0 0'));
-		me.TD(me, 1, me.columns - 2, lblTitle = makeXonoticTextLabel(0.5, _("???")));
+		me.TD(me, 1, me.columns - 2, lblTitle = makeXonoticTextLabel(0.5, "???"));
 		me.TD(me, 1, 1, btnNext = makeXonoticButton(">>", '0 0 0'));
 	me.TR(me);
 		me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeXonoticCampaignList());
diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index efafdf771..4ecda0a9a 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -862,7 +862,7 @@ void trigger_race_checkpoint_verify(entity this)
 	if (have_verified) return;
 	have_verified = true;
 
-	bool qual = g_race_qualifying;
+	int qual = g_race_qualifying;
 
 	int pl_race_checkpoint = 0;
 	int pl_race_place = 0;
@@ -872,7 +872,7 @@ void trigger_race_checkpoint_verify(entity this)
 			pl_race_checkpoint = race_NextCheckpoint(i);
 
 			// race only (middle of the race)
-			g_race_qualifying = false;
+			g_race_qualifying = 0;
 			pl_race_place = 0;
 			if (!Spawn_FilterOutBadSpots(this, findchain(classname, "info_player_deathmatch"), 0, false, true)) {
 				error(strcat("Checkpoint ", ftos(i), " misses a spawnpoint with race_place==", ftos(pl_race_place), " (used for respawning in race) - bailing out"));
diff --git a/qcsrc/server/race.qh b/qcsrc/server/race.qh
index acf35b2b0..1e851ee30 100644
--- a/qcsrc/server/race.qh
+++ b/qcsrc/server/race.qh
@@ -9,7 +9,7 @@ const float ST_RACE_LAPS = 1;
 
 int autocvar_g_cts_send_rankings_cnt = 15;
 
-bool g_race_qualifying;
+int g_race_qualifying;
 
 float speedaward_lastsent;
 float speedaward_lastupdate;