From: atheros <nexather@gmail.com>
Date: Fri, 29 Jul 2011 18:47:30 +0000 (+0200)
Subject: Allow dead players in CA to spectate next round
X-Git-Tag: xonotic-v0.5.0~122^2^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3724365790a1917631d5d94eec7bb5dd2860622;p=xonotic%2Fxonotic-data.pk3dir.git

Allow dead players in CA to spectate next round
---

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index c1d3162a5..8a24d63a4 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -239,6 +239,11 @@ void SV_ParseClientCommand(string s) {
 		if(self.classname == "player" && autocvar_sv_spectate == 1) {
 			ClientKill_TeamChange(-2); // observe
 		}
+		if(g_ca && self.classname == "spectator" && self.caplayer) {
+			// in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
+			sprint(self, "WARNING: you will spectate in the next round.\n");
+			self.caplayer = 0;
+		}
 	} else if(cmd == "join") {
 		if not(self.flags & FL_CLIENT)
 			return;