From: terencehill <piuntn@gmail.com>
Date: Tue, 23 Aug 2016 19:49:20 +0000 (+0200)
Subject: serverflags & SERVERFLAG_TEAMPLAY  -->  teamplay
X-Git-Tag: xonotic-v0.8.2~675
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bd50098b6a52dce50052454b12e8a55a7298ec9;p=xonotic%2Fxonotic-data.pk3dir.git

serverflags & SERVERFLAG_TEAMPLAY  -->  teamplay
---

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index e935d0cb2..88cdc3649 100644
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -356,7 +356,7 @@ void HUD_Radar()
 	IL_EACH(g_radaricons, it.teamradar_icon, {
 		if ( hud_panel_radar_mouse )
 		if ( it.health >= 0 )
-		if ( it.team == myteam+1 || gametype == MAPINFO_TYPE_RACE || !(serverflags & SERVERFLAG_TEAMPLAY) )
+		if ( it.team == myteam + 1 || gametype == MAPINFO_TYPE_RACE || !teamplay )
 		{
 			vector coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(it.origin));
 			if(vdist((mousepos - coord), <, 8))
diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 1211debf8..7de294681 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -708,7 +708,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new)
 		}*/
 		if(autocvar_cl_spawn_point_particles)
 		{
-			if((serverflags & SERVERFLAG_TEAMPLAY))
+			if(teamplay)
 			{
 				switch(teamnum)
 				{
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 06254c42a..7d38c3ea4 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -733,7 +733,7 @@ void ClientInit_misc(entity this)
 	else
 		WriteString(channel, "");
 	WriteByte(channel, this.count * 255.0); // g_balance_armor_blockpercent
-	WriteByte(channel, serverflags); // client has to know if it should zoom or not
+	WriteByte(channel, serverflags);
 	WriteCoord(channel, autocvar_g_trueaim_minrange);
 }
 
diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qh b/qcsrc/server/mutators/mutator/gamemode_assault.qh
index 1d53fcc68..43c5100cb 100644
--- a/qcsrc/server/mutators/mutator/gamemode_assault.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qh
@@ -3,7 +3,6 @@
 #include "../gamemode.qh"
 
 void assault_ScoreRules();
-void ActivateTeamplay();
 
 REGISTER_MUTATOR(as, false)
 {