X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=b2825bc825c79cab7e0e9a6ef5fde80e59a78a2e;hp=dde1467e69991a9cc2355071f1c9c2e6e5064486;hb=ba5086b4bd0887b2444e19a4919222dd4f594d06;hpb=9b1be706d74badec3925b51f64956ffffe4c77a8 diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index dde1467e6..b2825bc82 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -44,6 +44,9 @@ void CSQC_Init() { + cvar_set("_scoreboard_team_selection_available", "1"); + cvar_set("_scoreboard_team_selection", "0"); // in case it has been left set to 1 + prvm_language = strzone(cvar_string("prvm_language")); #ifdef WATERMARK @@ -58,8 +61,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(); @@ -151,6 +152,7 @@ void CSQC_Init() // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc) void Shutdown() { + cvar_set("_scoreboard_team_selection_available", "0"); WarpZone_Shutdown(); delete(teams); @@ -180,7 +182,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 +448,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 +475,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 +496,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 +1070,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 +1086,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(); @@ -1286,26 +1349,140 @@ NET_HANDLE(TE_CSQC_WEAPONCOMPLAIN, bool isNew) } } -NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew) +string translate_modifications(string s) +{ + return build_mutator_list(s); +} + +string translate_weaponarena(string s) { - string hostname = ReadString(); - string msg = ReadString(); - // players running older Xonotic version without the Welocome dialog have the cvar - // cl_welcome_in_menu_dialog not saved because it was created by the relative autocvar - // initilaization when server's client program is run - if (cvar_type("cl_welcome_in_menu_dialog") & CVAR_TYPEFLAG_SAVED && autocvar_cl_welcome_in_menu_dialog) + 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(); + if (campaign) + { + string campaign_title = ReadString(); + int campaign_level = ReadByte(); + string campaign_msg = ReadString(); string welcomedialog_args; - welcomedialog_args = strcat("name \"", hostname, "\""); + 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, " motd \"", msg, "\""); + welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\""); localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n"); + return true; } - else - centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", msg), -1, 0); + + strcpy(hostname, ReadString()); + + string hostversion = ReadString(); + bool version_mismatch = ReadByte(); + bool version_check = ReadByte(); + string ver = GetVersionMessage(hostversion, version_mismatch, version_check); + + string modifications = translate_modifications(ReadString()); + string weaponarena_list = translate_weaponarena(ReadString()); + string cache_mutatormsg = 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"); + + modifications = cons_mid(modifications, ", ", weaponarena_list); + if(modifications != "") + 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); + 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); + + 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) + { + 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 || isdemo() || !autocvar_cl_welcome) + // close it after it's been initialized so it can still be opened manually + localcmd("\ntogglemenu 0\n"); + } + + strfree(welcome_msg); + welcome_msg_menu_check_maxtime = 0; + } +} + +NET_HANDLE(TE_CSQC_SERVERWELCOME, bool isNew) +{ + return net_handle_ServerWelcome(); +} + string _getcommandkey(string cmd_name, string command, bool forcename) { string keys;