From: terencehill Date: Thu, 8 Jun 2023 15:28:35 +0000 (+0200) Subject: Survival, FT and CA: show eliminated players as soon as a player connects X-Git-Tag: xonotic-v0.8.6~17^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8b554363b516af916ff3c7e8ee1349516d5be6c;p=xonotic%2Fxonotic-data.pk3dir.git Survival, FT and CA: show eliminated players as soon as a player connects --- diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index 7a16141fc..f0a793afd 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -270,6 +270,9 @@ MUTATOR_HOOKFUNCTION(ca, PutClientInServer) Send_Notification(NOTIF_ONE_ONLY, player, MSG_INFO, INFO_CA_JOIN_LATE); } } + + if (!warmup_stage) + eliminatedPlayers.SendFlags |= 1; } MUTATOR_HOOKFUNCTION(ca, reset_map_players) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index f1e6b1ce2..77fbfc231 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -429,6 +429,11 @@ MUTATOR_HOOKFUNCTION(ft, PlayerSpawn) return true; } +MUTATOR_HOOKFUNCTION(ft, PutClientInServer) +{ + eliminatedPlayers.SendFlags |= 1; +} + MUTATOR_HOOKFUNCTION(ft, reset_map_players) { FOREACH_CLIENT(IS_PLAYER(it), { diff --git a/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc index 6414686e0..94748007e 100644 --- a/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc +++ b/qcsrc/common/gamemodes/gamemode/survival/sv_survival.qc @@ -258,6 +258,9 @@ MUTATOR_HOOKFUNCTION(surv, PutClientInServer) Send_Notification(NOTIF_ONE_ONLY, player, MSG_INFO, INFO_CA_JOIN_LATE); } } + + if (!warmup_stage) + eliminatedPlayers.SendFlags |= 1; } MUTATOR_HOOKFUNCTION(surv, reset_map_players)