Merge branch 'master' into terencehill/scoreboard_ui

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

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 3c3b5bc7e8fff7cf40eb4ec86e16d3c12dbe332a..f7bcb25957c8c5d3f49cdf9e8eea546f86320400 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,16 +495,24 @@ 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 (cvar("_menu_gamemenu_dialog_available"))
+               if (hudShiftState & S_TAB)
+               {
+                       Scoreboard_UI_Enable(0);
+                       return true;
+               }
+               if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
                {
                        localcmd("\nmenu_showgamemenudialog\n");
                        return true;
@@ -1053,7 +1075,9 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew)
                strcpy(teamscores_label(i), ReadString());
                teamscores_flags(i) = ReadByte();
        }
-       net_handle_ServerWelcome();
+       bool welcome_msg_too = ReadByte();
+       if (welcome_msg_too)
+               net_handle_ServerWelcome();
        return = true;
        Scoreboard_InitScores();
        Gamemode_Init();
@@ -1384,8 +1408,8 @@ bool net_handle_ServerWelcome()
                return true;
        }
 
-       bool force_centerprint = ReadByte();
-       string hostname = ReadString();
+       welcome_msg_force_centerprint = ReadByte();
+       strcpy(hostname, ReadString());
 
        string hostversion = ReadString();
        bool version_mismatch = ReadByte();
@@ -1415,17 +1439,35 @@ bool net_handle_ServerWelcome()
        if (motd != "")
                msg = strcat(msg, "\n\n^8", _("MOTD:"), " ^7", motd);
 
-       if (!force_centerprint && !isdemo() && cvar("_menu_welcome_dialog_available") && autocvar_cl_welcome_in_menu_dialog)
+       strcpy(welcome_msg, msg);
+       welcome_msg_menu_check_maxtime = time + 1; // wait for menu to load before showing the welcome dialog
+       return true;
+}
+
+void Welcome_Message_Show_Try()
+{
+       if (!welcome_msg_menu_check_maxtime)
+               return;
+
+       bool want_dialog = (!welcome_msg_force_centerprint && !isdemo() && autocvar_cl_welcome_in_menu_dialog);
+       // if want dialog check if menu is initialized but for a short time
+       if (!want_dialog || cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime)
        {
-               string welcomedialog_args;
-               welcomedialog_args = strcat("HOSTNAME \"", hostname, "\"");
-               msg = MakeConsoleSafe(strreplace("\n", "\\n", msg));
-               welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\"");
-               localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
+               if (want_dialog && cvar("_menu_welcome_dialog_available"))
+               {
+                       string welcomedialog_args = strcat("HOSTNAME \"", hostname, "\"");
+                       string msg = MakeConsoleSafe(strreplace("\n", "\\n", welcome_msg));
+                       welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\"");
+                       localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
+                       if (intermission) // close it after it's been initialized so it can still be opened manually
+                               localcmd("\ntogglemenu 0\n");
+               }
+               else
+                       centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", welcome_msg), -1, 0);
+
+               strfree(welcome_msg);
+               welcome_msg_menu_check_maxtime = 0;
        }
-       else
-               centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", msg), -1, 0);
-       return true;
 }
 
 NET_HANDLE(TE_CSQC_SERVERWELCOME, bool isNew)