maxclients = i;
}
- ReplicateVars(REPLICATEVARS_SEND_ALL);
-
// needs to be done so early because of the constants they create
static_init();
static_init_late();
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");
TrueAim_Init();
+ // this can't be called in CSQC_Init as it'd send cvars too early
+ ReplicateVars_Start();
+
postinit = true;
}
if (nPrimary == K_ESCAPE && !(hudShiftState & S_SHIFT) && key_pressed)
{
- if (cvar("_menu_gamemenu_dialog_available"))
+ if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
{
localcmd("\nmenu_showgamemenudialog\n");
return true;
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();
return true;
}
- bool force_centerprint = ReadByte();
- string hostname = ReadString();
+ welcome_msg_force_centerprint = ReadByte();
+ strcpy(hostname, ReadString());
string hostversion = ReadString();
bool version_mismatch = ReadByte();
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");
+ }
+ 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)