This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.5a in repository iortcw.
commit 2aa70839739656f9506472939f83eb936bf6ce7c Author: MAN-AT-ARMS <[email protected]> Date: Sun Jun 5 15:36:32 2016 -0400 MP: Move returns for update server --- MP/code/server/sv_main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/MP/code/server/sv_main.c b/MP/code/server/sv_main.c index 189d738..6ddda3f 100644 --- a/MP/code/server/sv_main.c +++ b/MP/code/server/sv_main.c @@ -248,14 +248,14 @@ void SV_MasterHeartbeat(const char *message) int res; int netenabled; - Com_Memset(adr, 0, sizeof(netadr_t) * 2); - netenabled = Cvar_VariableIntegerValue("net_enabled"); - // DHM - Nerve :: Update Server doesn't send heartbeat #ifdef UPDATE_SERVER return; #endif + Com_Memset(adr, 0, sizeof(netadr_t) * 2); + netenabled = Cvar_VariableIntegerValue("net_enabled"); + // "dedicated 1" is for lan play, "dedicated 2" is for inet public play if (!com_dedicated || com_dedicated->integer != 2 || !(netenabled & (NET_ENABLEV4 | NET_ENABLEV6))) return; // only dedicated servers send heartbeats @@ -348,17 +348,16 @@ void SV_MasterGameCompleteStatus() { int res; int netenabled; - Com_Memset(adr, 0, sizeof(netadr_t) * 2); - netenabled = Cvar_VariableIntegerValue("net_enabled"); - // DHM - Nerve :: Update Server doesn't send gameCompleteStatus #ifdef UPDATE_SERVER return; #endif + Com_Memset(adr, 0, sizeof(netadr_t) * 2); + netenabled = Cvar_VariableIntegerValue("net_enabled"); // "dedicated 1" is for lan play, "dedicated 2" is for inet public play if (!com_dedicated || com_dedicated->integer != 2 || !(netenabled & (NET_ENABLEV4 | NET_ENABLEV6))) - return; // only dedicated servers send heartbeats + return; // only dedicated servers send gameCompleteStatus // send to group masters for (i = 0; i < MAX_MASTER_SERVERS; i++) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
