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

diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qh
index 8c8453d76894666430f8dabbc6858b4f13423313..371f7a250efcbe0042d507bdae8eb3fcbf2bd52b 100644 (file)
--- 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 57184dc00f0a48103757f5491cbecf80fa26c9fa..ded656605c58829cdc79be4ddc2c928e8bc3e1e4 100644 (file)
--- 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 efafdf7717d7235067c28666ea1c8eb81a17c36a..4ecda0a9a09732b0411f164b1d4e3c175a729005 100644 (file)
--- 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 acf35b2b0a89e09ed1a4e4634b85a50de6cb3e46..1e851ee3041e7fd671397c917571292b5a5ef863 100644 (file)
--- 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;