X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=4ff86d3cfbdbc8672e658f30bdbf2625aaa60649;hb=4934cbeb6ff939a5c0f3276ceae717bb66417e71;hp=75fb7169e1017755cef2531825d0f9f68c5d5cca;hpb=71fc0f0f03ecea79e11a71e3f8b51b77598a019e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 75fb7169e..4ff86d3cf 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(); @@ -102,6 +100,10 @@ void CSQC_Init() if(autocvar_cl_lockview) cvar_set("cl_lockview", "0"); + if (cvar_type("_scoreboard_team_selection_available") & CVAR_TYPEFLAG_EXISTS) + cvar_settemp("_scoreboard_team_selection_available", "1"); + cvar_set("_scoreboard_team_selection", "0"); // in case it has been left set to 1 + gametype = NULL; postinit = false; @@ -127,7 +129,6 @@ void CSQC_Init() { get_mi_min_max_texcoords(1); // try the CLEVER way first minimapname = strcat("gfx/", mi_shortname, "_radar"); - shortmapname = mi_shortname; if (precache_pic(minimapname) == "") { @@ -180,7 +181,14 @@ void Shutdown() if (!(calledhooks & HOOK_START)) localcmd("\n_cl_hook_gamestart nop\n"); if (!(calledhooks & HOOK_END)) + { + int gamecount = cvar("cl_matchcount"); localcmd("\ncl_hook_gameend\n"); + // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend + // earlier versions of the game abuse the hook to set this cvar + localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n")); + //cvar_set("cl_matchcount", itos(gamecount + 1)); + } } localcmd("\ncl_hook_shutdown\n"); @@ -439,9 +447,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 +474,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 +505,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 +1085,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(); @@ -1314,6 +1348,55 @@ NET_HANDLE(TE_CSQC_WEAPONCOMPLAIN, bool isNew) } } +string translate_modifications(string s) +{ + return build_mutator_list(s); +} + +string translate_weaponarena(string s) +{ + if (s == "") return s; + if (s == "All Weapons Arena") return _("All Weapons Arena"); + if (s == "All Available Weapons Arena") return _("All Available Weapons Arena"); + 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, " & "); + string wpn_list = ""; + for (int i = 0; i < n; i++) + { + Weapon wep = Weapon_from_name(argv(i)); + if (wep == WEP_Null) + LOG_INFO("^3Warning: ^7server sent an invalid weapon name\n"); + wpn_list = cons_mid(wpn_list, " & ", wep.m_name); + } + if (wpn_list != "") + return sprintf(_("%s Arena"), wpn_list); + else + return _("No Weapons Arena"); +} + +string GetVersionMessage(string hostversion, bool version_mismatch, bool version_check) +{ + string xonotic_hostversion = strcat("Xonotic ", hostversion); + if (version_mismatch) + { + if(!version_check) + return strcat(sprintf(_("This is %s"), xonotic_hostversion), "\n^3", + _("Your client version is outdated."), "\n\n\n", + _("### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###"), "\n\n\n", + _("Please update!")); + else + return strcat(sprintf(_("This is %s"), xonotic_hostversion), "\n^3", + _("This server is using an outdated Xonotic version."), "\n\n\n", + _("### THIS SERVER IS INCOMPATIBLE AND THUS YOU CANNOT JOIN ###")); + } + return sprintf(_("Welcome to %s"), xonotic_hostversion); +} + bool net_handle_ServerWelcome() { bool campaign = ReadByte(); @@ -1335,36 +1418,101 @@ bool net_handle_ServerWelcome() return true; } - bool force_centerprint = ReadByte(); - string hostname = ReadString(); - string ver = ReadString(); - string modifications = ReadString(); + strcpy(hostname, ReadString()); + string hostversion = ReadString(); + bool version_mismatch = ReadByte(); + bool version_check = ReadByte(); + srv_minplayers = ReadByte(); + srv_maxplayers = ReadByte(); + 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", strcat(_("Gametype:"), " ^1", MapInfo_Type_ToText(gametype)), "^8\n"); + string msg = GetVersionMessage(hostversion, version_mismatch, version_check); + + msg = strcat(msg, "\n\n", _("Gametype:"), " ^1", MapInfo_Type_ToText(gametype), "\n"); + + msg = strcat(msg, "\n", _("Map:"), " ^2"); + if (world.message == "") + msg = strcat(msg, mi_shortname, "\n"); + else + { + int i = strstrofs(world.message, " by ", 0); // matches _MapInfo_Generate() + string longname = i >= 0 ? substring(world.message, 0, i) : world.message; + msg = strcat(msg, (strcasecmp(longname, mi_shortname) ? strcat(mi_shortname, " ^7// ^2") : ""), longname, "\n"); + } + + if (srv_minplayers || srv_maxplayers) + { + msg = strcat(msg, "\n", _("This match supports"), " ^5"); + if (srv_minplayers == srv_maxplayers) + msg = strcat(msg, sprintf(_("%d players"), srv_maxplayers), "\n"); + else if (srv_minplayers && srv_maxplayers) + msg = strcat(msg, sprintf(_("%d to %d players"), srv_minplayers, srv_maxplayers), "\n"); + else if (srv_maxplayers) + msg = strcat(msg, sprintf(_("%d players maximum"), srv_maxplayers), "\n"); + else + msg = strcat(msg, sprintf(_("%d players minimum"), srv_minplayers), "\n"); + } + + modifications = cons_mid(modifications, ", ", weaponarena_list); if(modifications != "") - msg = strcat(msg, "^8\n", _("Active modifications:"), " ^3", modifications, "^8\n"); + msg = strcat(msg, "\n", _("Active modifications:"), " ^3", modifications, "\n"); + if (cache_mutatormsg != "") - msg = strcat(msg, "\n\n^8", _("Special gameplay tips:"), " ^7", cache_mutatormsg); + msg = strcat(msg, "\n", _("Special gameplay tips:"), " ^7", cache_mutatormsg, "\n"); + 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); + msg = strcat(msg, "\n^9↓ ", _("Server's message"), " ↓\n", 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; + + // if want dialog check if menu is initialized but for a short time + if (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 (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, "\""); + + if (intermission || isdemo() || !autocvar_cl_welcome) + { + if (cvar("_menu_cmd_closemenu_available")) + { + // initialize the dialog without opening it + localcmd("\nmenu_cmd closemenu Welcome ", welcomedialog_args, "\n"); + } + else + { + // legacy code for clients with old menus + // since togglemenu 0 doesn't close the dialog but only hides it, + // playing back a demo the Welcome dialog will pop up on the first ESC press + localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n"); + // close it after it's been initialized so it can still be opened manually + localcmd("\ntogglemenu 0\n"); + } + } + else + localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n"); + } + + 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)