X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=f7bcb25957c8c5d3f49cdf9e8eea546f86320400;hb=6fc8e82f78a5444482f45e463d608c1d7798327c;hp=1441eedf039882c98d9cb8f7cc8d0360f6a729fc;hpb=5c9a64bdd3ec33370513dcc9146e7e0c9d971498;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 1441eedf0..f7bcb2595 100644 --- 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; @@ -471,6 +485,40 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary) if(override) return true; + if(bInputType == 3 || bInputType == 2) + return false; + + // at this point bInputType can only be 0 or 1 (key pressed or released) + bool key_pressed = (bInputType == 0); + + if(key_pressed) { + 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"); + return true; + } + } + return false; } @@ -1011,6 +1059,7 @@ void Fog_Force() localcmd(sprintf("\nfog %s\nr_fog_exp2 0\nr_drawfog 1\n", forcefog)); } +bool net_handle_ServerWelcome(); NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew) { make_pure(this); @@ -1026,6 +1075,9 @@ NET_HANDLE(ENT_CLIENT_SCORES_INFO, bool isnew) strcpy(teamscores_label(i), ReadString()); teamscores_flags(i) = ReadByte(); } + bool welcome_msg_too = ReadByte(); + if (welcome_msg_too) + net_handle_ServerWelcome(); return = true; Scoreboard_InitScores(); Gamemode_Init(); @@ -1295,11 +1347,11 @@ string translate_weaponarena(string s) { if (s == "") return s; if (s == "All Weapons Arena") return _("All Weapons Arena"); - if (s == "Dev All Weapons Arena") return s; // development option, do not translate - if (s == "Most Weapons Arena") return _("Most Weapons Arena"); if (s == "All Available Weapons Arena") return _("All Available Weapons Arena"); - if (s == "Dev All Available Weapons Arena") return s; // development option, do not translate + if (s == "Most Weapons Arena") return _("Most Weapons Arena"); if (s == "Most Available Weapons Arena") return _("Most Available Weapons Arena"); + if (s == "Dev All Weapons Arena") return s; // development option, do not translate + if (s == "Dev All Available Weapons Arena") return s; // development option, do not translate if (s == "No Weapons Arena") return _("No Weapons Arena"); int n = tokenizebyseparator(s, " & "); @@ -1311,7 +1363,10 @@ string translate_weaponarena(string s) LOG_INFO("^3Warning: ^7server sent an invalid weapon name\n"); wpn_list = cons_mid(wpn_list, " & ", wep.m_name); } - return sprintf(_("%s Arena"), wpn_list); + if (wpn_list != "") + return sprintf(_("%s Arena"), wpn_list); + else + return _("No Weapons Arena"); } string GetVersionMessage(string hostversion, bool version_mismatch, bool version_check) @@ -1332,10 +1387,29 @@ string GetVersionMessage(string hostversion, bool version_mismatch, bool version return sprintf(_("Welcome to %s"), xonotic_hostversion); } -NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew) +bool net_handle_ServerWelcome() { - bool force_centerprint = ReadByte(); - string hostname = ReadString(); + bool campaign = ReadByte(); + if (campaign) + { + string campaign_title = ReadString(); + int campaign_level = ReadByte(); + string campaign_msg = ReadString(); + string welcomedialog_args; + welcomedialog_args = strcat("HOSTNAME \"", campaign_title, "\""); + string key = getcommandkey(_("jump"), "+jump"); + string msg = strcat( + CCR("^F1"), sprintf(_("Level %d:"), campaign_level), + sprintf(CCR(" ^BG%s\n^3\n"), campaign_msg), + sprintf(CCR(_("^BGPress ^F2%s^BG to enter the game")), key)); + msg = MakeConsoleSafe(strreplace("\n", "\\n", msg)); + welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\""); + localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n"); + return true; + } + + welcome_msg_force_centerprint = ReadByte(); + strcpy(hostname, ReadString()); string hostversion = ReadString(); bool version_mismatch = ReadByte(); @@ -1345,32 +1419,60 @@ NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew) string modifications = translate_modifications(ReadString()); string weaponarena_list = translate_weaponarena(ReadString()); string cache_mutatormsg = ReadString(); - string mutator_msg = ReadString(); string motd = ReadString(); string msg = ""; msg = strcat(msg, ver); - msg = strcat(msg, "^8\n\n", _("match type is "), " ^1", MapInfo_Type_ToText(gametype), "^8\n"); + msg = strcat(msg, "^8\n\n", strcat(_("Gametype:"), " ^1", MapInfo_Type_ToText(gametype)), "^8\n"); + modifications = cons_mid(modifications, ", ", weaponarena_list); if(modifications != "") - msg = strcat(msg, "^8\n", _("active modifications:"), " ^3", modifications, "^8\n"); + msg = strcat(msg, "^8\n", _("Active modifications:"), " ^3", modifications, "^8\n"); + if (cache_mutatormsg != "") - msg = strcat(msg, "\n\n^8", _("special gameplay tips:"), " ^7", cache_mutatormsg); + msg = strcat(msg, "\n\n^8", _("Special gameplay tips:"), " ^7", cache_mutatormsg); + string mutator_msg = ""; + MUTATOR_CALLHOOK(BuildGameplayTipsString, mutator_msg); + mutator_msg = M_ARGV(0, string); msg = strcat(msg, mutator_msg); // trust that the mutator will do proper formatting + 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) +{ + return net_handle_ServerWelcome(); } string _getcommandkey(string cmd_name, string command, bool forcename)