From 0af9b5321c7695237d6887d67c936fcd6179bb72 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 11 Apr 2022 19:18:33 +0200 Subject: [PATCH] Fix centerprint Welcome message displayed together with the Welcome dialog when a local client connects to a local dedicated server --- qcsrc/client/main.qc | 2 +- qcsrc/menu/menu.qc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 10d4cef98..0892bb6bf 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1368,7 +1368,7 @@ void Welcome_Message_Show_Try() 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") || time > welcome_msg_menu_check_maxtime) + if (!want_dialog || cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime) { if (want_dialog && cvar("_menu_welcome_dialog_available")) { diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index efed9ff2e..933136410 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -221,6 +221,8 @@ void m_init_delayed() } if (Menu_Active) m_display(); // delayed menu display + + cvar_set("_menu_initialized", "2"); } void m_keyup(float key, float ascii) -- 2.39.2