From: z411 Date: Sun, 12 Dec 2021 18:02:40 +0000 (-0300) Subject: Making boolean name more descriptive X-Git-Tag: xonotic-v0.8.5~253^2~2 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=faf6c0d502a8a23ccbd3131d18ca790cffccd2f7;p=xonotic%2Fxonotic-data.pk3dir.git Making boolean name more descriptive --- diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 550919d73..555e43936 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -418,7 +418,7 @@ void ReadyRestart_force() if (time <= game_starttime && game_stopped) return; - bprint("^1Server is restarting...\n"); + bprint("^1Match is restarting...\n"); VoteReset(); @@ -471,7 +471,7 @@ void ReadyRestart_force() if (autocvar_sv_eventlog) GameLogEcho(":restart"); } -void ReadyRestart(bool endWarmup) +void ReadyRestart(bool forceWarmupEnd) { if (MUTATOR_CALLHOOK(ReadyRestart_Deny) || intermission_running || race_completing) localcmd("restart\n"); else localcmd("\nsv_hook_readyrestart\n"); @@ -480,10 +480,10 @@ void ReadyRestart(bool endWarmup) // Otherwise scores could be manipulated during the countdown. if (!sv_ready_restart_after_countdown) Score_ClearAll(); - if(endWarmup) + if(forceWarmupEnd) warmup_stage = 0; // forcefully end warmup and go to match stage else - warmup_stage = cvar("g_warmup"); // go into warmup if it's enabled, otherwise restart into match stage anyway + warmup_stage = cvar("g_warmup"); // go into warmup if it's enabled, otherwise restart into match stage ReadyRestart_force(); }