Merge branch 'is_not_beaten' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 026db91f5edc84e519b6ceb71a41cd3a88c8e111..b7b7e530371b9430a90621262fd34c7ba453f6c2 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -143,6 +143,8 @@ void CSQC_Init()
        registercvar("cl_weapon_switch_reload", "1");
        registercvar("cl_weapon_switch_fallback_to_impulse", "1");
 
+       registercvar("cl_allow_uidranking", "1");
+
        if(autocvar_cl_lockview)
                cvar_set("cl_lockview", "0");
 
@@ -230,13 +232,15 @@ void Shutdown()
 
        deactivate_minigame();
        HUD_MinigameMenu_Close(NULL, NULL, NULL);
+
+       ReplicateVars(true); // destroy
 }
 
 .float has_team;
 bool SetTeam(entity o, int Team)
 {
        TC(int, Team);
-       devassert_once(Team);
+       //devassert_once(Team);
        entity tm;
        if(teamplay)
        {
@@ -1124,7 +1128,10 @@ NET_HANDLE(TE_CSQC_RACE, bool isNew)
                case RACE_NET_PENALTY_QUALIFYING:
                        race_penaltyeventtime = time;
                        race_penaltytime = ReadShort();
-                       strcpy(race_penaltyreason, ReadString());
+                       string reason = ReadString();
+                       if (reason == "missing a checkpoint")
+                               reason = _("missing a checkpoint");
+                       strcpy(race_penaltyreason, reason);
                        if (b == RACE_NET_PENALTY_QUALIFYING)
                                race_penaltyaccumulator += race_penaltytime;
                        break;