From 85f0dffe09eb71698b36a291e6d6471f1a0bfabe Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 28 Nov 2021 00:03:28 +0100
Subject: [PATCH] Remove CSMultiplayerRules' MakeSpectator, as we have our own
 MakeTempSpectator as part of the NSPlayer class now.

---
 src/server/gamerules_multiplayer.qc | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index 5b1eca7..6cccfa3 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -861,14 +861,7 @@ MakePlayable(entity targ)
 
 	self = oself;
 }
-static void
-MakeSpectator(entity targ)
-{
-	entity oself = self;
-	self = targ;
-	spawnfunc_spectator();
-	self = oself;
-}
+
 void
 CSMultiplayerRules::PlayerMakePlayable(base_player pp, int chara)
 {
@@ -912,10 +905,11 @@ Force the player to become an observer.
 =================
 */
 void
-CSMultiplayerRules::PlayerMakeSpectator(base_player pl)
+CSMultiplayerRules::PlayerMakeSpectator(base_player pp)
 {
+	player pl = (player)pp;
+	pl.MakeTempSpectator();
 	PlayerClearWeaponry(pl);
-	MakeSpectator(pl);
 }
 
 /*