serverflags & SERVERFLAG_TEAMPLAY --> teamplay

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index e935d0cb2b27eba1b395593ca192b412afc13c2e..88cdc3649e764ca41fa756bd595ff6ccc38bdfca 100644 (file)
--- 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 1211debf8753c5b17bd6b4d1a21a79ef404f5c98..7de2946819ceeabef3852073e8ed6ea7a3e66efb 100644 (file)
--- 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 06254c42a0648b877aef9adf36e4a9ca62c30aea..7d38c3ea44e2ad45455193926b41e2866e5c2bf9 100644 (file)
--- 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 1d53fcc68084c59edac468faec3188a80a791954..43c5100cbca59b949ceaa02ade21107a6aef9898 100644 (file)
--- 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)
 {