From: Mario Date: Sat, 7 Sep 2019 06:17:01 +0000 (+1000) Subject: Add a server hook alias for the end of warmup stage (when the real match is going... X-Git-Tag: xonotic-v0.8.5~1311^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=923bb27d304e67d315f3844aab628e19f7137996;p=xonotic%2Fxonotic-data.pk3dir.git Add a server hook alias for the end of warmup stage (when the real match is going to begin) --- diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index d79c2418d..a5cc73834 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -440,6 +440,8 @@ void ReadyRestart_force() restart_mapalreadyrestarted = false; // reset this var, needed when cvar sv_ready_restart_repeatable is in use // disable the warmup global for the server + if(warmup_stage) + localcmd("\nsv_hook_warmupend\n"); warmup_stage = 0; // once the game is restarted the game is in match stage // reset the .ready status of all players (also spectators) diff --git a/xonotic-server.cfg b/xonotic-server.cfg index f914a7b11..828219ca9 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -32,6 +32,8 @@ set g_warmup_allow_timeout 0 "allow calling timeouts in the warmup-stage (if sv_ set g_warmup_allguns 1 "provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons" set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end" +alias sv_hook_warmupend + set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage" set sv_vote_nospectators 0 "only players can call a vote (thus spectators and observers can't call a vote): 0 = all people can vote, 1 = spectators can vote in warmup stage, 2 = only players can vote (no exceptions)."