From: atheros <nexather@gmail.com>
Date: Fri, 29 Jul 2011 21:43:13 +0000 (+0200)
Subject: Dead CA player can stop playing (now both, while observing and spectating)
X-Git-Tag: xonotic-v0.5.0~122^2^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b81859f237b9db8f0290b8a13db2ed1850646547;p=xonotic%2Fxonotic-data.pk3dir.git

Dead CA player can stop playing (now both, while observing and spectating)
---

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index 8a24d63a4..bace1dd7e 100644
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -239,7 +239,7 @@ 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) {
+		if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) {
 			// 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;