From: bones_was_here <bones_was_here@xonotic.au>
Date: Fri, 11 Apr 2025 08:20:28 +0000 (+1000)
Subject: spec command: add support for "0" argument
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3430757c69959da7e8b2ca9bf807d14a91c93013;p=xonotic%2Fxonotic-data.pk3dir.git

spec command: add support for "0" argument

This returns to observing without leaving the join queue or CA team
(like +attack2).
---

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index bb118f888a..1663fe17bd 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -752,7 +752,17 @@ void ClientCommand_spectate(entity caller, int request)
 			{
 				if(argv(1) != "")
 				{
-					if(IS_SPEC(caller) || IS_OBSERVER(caller))
+					if (!(IS_SPEC(caller) || IS_OBSERVER(caller)))
+						sprint(caller, "cmd spectate <client> only works when you are spectator/observer\n");
+					else if (argv(1) == "0")
+					{ // switch back to observing without leaving the CA team or join queue (like +attack2)
+						if (!IS_OBSERVER(caller))
+						{
+							TRANSMUTE(Observer, caller);
+							PutClientInServer(caller);
+						}
+					}
+					else
 					{
 						entity client = GetFilteredEntity(argv(1));
 						float spec_accepted = VerifyClientEntity(client, false, false);
@@ -766,8 +776,6 @@ void ClientCommand_spectate(entity caller, int request)
 						else
 							sprint(caller, "Can't spectate ", argv(1), "^7\n");
 					}
-					else
-						sprint(caller, "cmd spectate <client> only works when you are spectator/observer\n");
 					return;
 				}