X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=1dba6aa9675efb01ccd9e21fe059cf6a4e90f0ed;hb=cf505e49042d8f0c221e409cf3f31e135ed74860;hp=091cc466183efecd96bda5291383c2aab720acda;hpb=90908cc793110f8c34a83aaf0e4d700ac90e87b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 091cc4661..1dba6aa96 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -100,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; @@ -125,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) == "") { @@ -178,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"); @@ -443,6 +453,15 @@ void PostInit() 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. @@ -455,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; @@ -482,15 +505,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"); @@ -1387,23 +1418,44 @@ bool net_handle_ServerWelcome() return true; } - welcome_msg_force_centerprint = ReadByte(); strcpy(hostname, ReadString()); - string hostversion = ReadString(); bool version_mismatch = ReadByte(); bool version_check = ReadByte(); - string ver = GetVersionMessage(hostversion, version_mismatch, version_check); - + srv_minplayers = ReadByte(); + srv_maxplayers = ReadByte(); string modifications = translate_modifications(ReadString()); string weaponarena_list = translate_weaponarena(ReadString()); string cache_mutatormsg = ReadString(); string motd = ReadString(); - string msg = ""; - msg = strcat(msg, ver); + string msg = GetVersionMessage(hostversion, version_mismatch, version_check); + msg = strcat(msg, "^8\n\n", strcat(_("Gametype:"), " ^1", MapInfo_Type_ToText(gametype)), "^8\n"); + msg = strcat(msg, "^8\n", _("Map:"), " ^2"); + if (world.message == "") + msg = strcat(msg, mi_shortname, "^8\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, "^8\n"); + } + + if (srv_minplayers || srv_maxplayers) + { + msg = strcat(msg, "^8\n", _("This match supports"), " ^5"); + if (srv_minplayers == srv_maxplayers) + msg = strcat(msg, sprintf(_("%d players"), srv_maxplayers), "^8\n"); + else if (srv_minplayers && srv_maxplayers) + msg = strcat(msg, sprintf(_("%d to %d players"), srv_minplayers, srv_maxplayers), "^8\n"); + else if (srv_maxplayers) + msg = strcat(msg, sprintf(_("%d players maximum"), srv_maxplayers), "^8\n"); + else + msg = strcat(msg, sprintf(_("%d players minimum"), srv_minplayers), "^8\n"); + } + modifications = cons_mid(modifications, ", ", weaponarena_list); if(modifications != "") msg = strcat(msg, "^8\n", _("Active modifications:"), " ^3", modifications, "^8\n"); @@ -1428,21 +1480,19 @@ 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) + if (cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime) { - if (want_dialog && cvar("_menu_welcome_dialog_available")) + 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, "\""); localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n"); - if (intermission) // close it after it's been initialized so it can still be opened manually + if (intermission || isdemo() || !autocvar_cl_welcome) + // 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;