Fix ESC key not closing team selection if automatically opened by the server, scorebo...

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 5beca00bef44dd88d0d05ef17464ba8a7510e455..aa5e50038c7b50daab0b0fabf67df42a215b1406 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -58,8 +58,6 @@ void CSQC_Init()
                maxclients = i;
        }
 
-       ReplicateVars(REPLICATEVARS_SEND_ALL);
-
        // needs to be done so early because of the constants they create
        static_init();
        static_init_late();
@@ -439,9 +437,21 @@ void PostInit()
 
        TrueAim_Init();
 
+       // this can't be called in CSQC_Init as it'd send cvars too early
+       ReplicateVars_Start();
+
        postinit = true;
 }
 
+void Release_Common_Keys()
+{
+       localcmd("-fire\n");
+       localcmd("-fire2\n");
+       localcmd("-use\n");
+       localcmd("-hook\n");
+       localcmd("-jump\n");
+}
+
 // CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
 // Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
 // All keys are in ascii.
@@ -454,6 +464,10 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
        TC(int, bInputType);
        bool override = false;
 
+       override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
+       if (override)
+               return true;
+
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
        if (override)
                return true;
@@ -481,15 +495,23 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
                if(nPrimary == K_ALT) hudShiftState |= S_ALT;
                if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
                if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+               if(nPrimary == K_TAB) hudShiftState |= S_TAB;
        }
        else {
                if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
                if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
                if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+               if(nPrimary == K_TAB) hudShiftState -= (hudShiftState & S_TAB);
        }
 
+       // NOTE: Shift-Escape must be filtered out because it's the hardcoded console shortcut
        if (nPrimary == K_ESCAPE && !(hudShiftState & S_SHIFT) && key_pressed)
        {
+               if (hudShiftState & S_TAB)
+               {
+                       Scoreboard_UI_Enable(0);
+                       return true;
+               }
                if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
                {
                        localcmd("\nmenu_showgamemenudialog\n");