Merge branch 'terencehill/welcome_dialog_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 35845da036e0f7f959d2167695171de3cdf05131..4ff86d3cfbdbc8672e658f30bdbf2625aaa60649 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -44,9 +44,6 @@
 
 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
@@ -103,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;
@@ -128,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) == "")
                {
@@ -152,7 +152,6 @@ 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);
@@ -1420,34 +1419,56 @@ bool net_handle_ServerWelcome()
        }
 
        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);
-       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);
 
        strcpy(welcome_msg, msg);
        welcome_msg_menu_check_maxtime = time + 1; // wait for menu to load before showing the welcome dialog