undo unintentional changes; restrict CA spectators by default

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index e7d0ed257f6f43aba2d2057390cbe90fe6105a4a..631731f78f7ce8987850924b19c3f1f5c4df8831 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -808,7 +808,7 @@ set g_arena_powerups 0      "enables powerups (superhealth, strength and shield), whi
 set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
 set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
 set g_ca_point_leadlimit 0
-set g_ca_spectate_enemies 1 "Allow spectating enemy player by dead player during clan arena games."
+set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games."
 set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
 
 // onslaught

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index a146e183c113b98edca54b11200798fe198c08b7..598c6740fbd6d32cf50c8f98eaf4c1d6d9845f54 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2396,29 +2396,30 @@ float SpectateNext() {
        
        if (other)
                self.enemy = other;
-       
+
        if(self.enemy.classname == "player") {
-               if(self.enemy.vehicle)
-               {          
-                       msg_entity = self;
-                       WriteByte(MSG_ONE, SVC_SETVIEWPORT);
-                       WriteEntity(MSG_ONE, self.enemy);
-                       //stuffcmd(self, "set viewsize $tmpviewsize \n");
-                       self.movetype = MOVETYPE_NONE;
-                       accuracy_resend(self);
-               }
-               else
-               {
-                       msg_entity = self;
-                       WriteByte(MSG_ONE, SVC_SETVIEW);
-                       WriteEntity(MSG_ONE, self.enemy);
-                       //stuffcmd(self, "set viewsize $tmpviewsize \n");
-                       self.movetype = MOVETYPE_NONE;
-                       accuracy_resend(self);
-                       if(!SpectateUpdate())
-                               PutObserverInServer();
-               }
-               return 1;
+           if(self.enemy.vehicle)
+           {      
+            msg_entity = self;
+            WriteByte(MSG_ONE, SVC_SETVIEWPORT);
+            WriteEntity(MSG_ONE, self.enemy);
+            //stuffcmd(self, "set viewsize $tmpviewsize \n");
+            self.movetype = MOVETYPE_NONE;
+            accuracy_resend(self);
+           }
+           else 
+           {           
+            msg_entity = self;
+            WriteByte(MSG_ONE, SVC_SETVIEW);
+            WriteEntity(MSG_ONE, self.enemy);
+            //stuffcmd(self, "set viewsize $tmpviewsize \n");
+            self.movetype = MOVETYPE_NONE;
+            accuracy_resend(self);
+
+            if(!SpectateUpdate())
+                PutObserverInServer();
+        }
+        return 1;
        } else {
                return 0;
        }