change many uses of the teamplay cvar to teams_matter

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 36334b27127b218ece882fbbc6ea47da559fdad9..6d79ebe30bd622e426295c956eb669f78a21c4ec 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1,3 +1,4 @@
 float autocvar_sv_cheats;
 float autocvar_g_bastet;
+float autocvar_teamplay;
 var float autocvar_g_movement_highspeed = 1;

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index fc578c357e3c4e1e67ad74c84ce86566324462f1..a784ef48b17542c38d9448ea3631ec344aa23654 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -563,7 +563,7 @@ void bot_serverframe()
        // But don't remove bots immediately on level change, as the real players
        // usually haven't rejoined yet
        bots_would_leave = FALSE;
-       if (autocvar_teamplay && cvar("bot_vs_human") && (c3==-1 && c4==-1))
+       if (teams_matter && cvar("bot_vs_human") && (c3==-1 && c4==-1))
                bots = min(ceil(fabs(cvar("bot_vs_human")) * activerealplayers), maxclients - realplayers);
        else if ((realplayers || cvar("bot_join_empty") || (currentbots > 0 && time < 5)))
        {

diff --git a/qcsrc/server/monsters/mode_management.qc b/qcsrc/server/monsters/mode_management.qc
index f85bbcf0be54ebbc060fa9d5a12e655c0dba7fab..9014f093813e160443e6b1e6d39d284534ca76c8 100644 (file)
--- a/qcsrc/server/monsters/mode_management.qc
+++ b/qcsrc/server/monsters/mode_management.qc
@@ -143,7 +143,7 @@ void(float c) SV_ChangeTeam =
        if (mode_shirtmustmatchpants || shirt < 0)
                shirt = pants;
        setcolor(self, pants + shirt * 16);
-       if (pants != old && old >= 0 && autocvar_teamplay && deathmatch)
+       if (pants != old && old >= 0 && teams_matter && deathmatch)
        {
                T_Damage(self, self, self, 0, 0, " changed teams", DT_TELEFRAG, self.origin, '0 0 0', Obituary_Generic);
                self.frags = 0;

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 48729773db03f29d0ddbc2124171fe53bf9b1ac8..1df46990a7a508f0ed0f301b659a6e78593bb075 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -33,7 +33,7 @@ float check_tdeath(entity player, vector org, vector telefragmin, vector telefra
        {
                TDEATHLOOP(org)
                {
-                       if not(autocvar_teamplay && cvar("g_telefrags_teamplay") && head.team == player.team)
+                       if not(teams_matter && cvar("g_telefrags_teamplay") && head.team == player.team)
                                if(head.classname == "player")
                                        if(head.health >= 1)
                                                return 1;
@@ -48,7 +48,7 @@ void tdeath(entity player, entity teleporter, entity telefragger, vector telefra
        {
                if (player.classname == "player" && player.health >= 1)
                {
-                       if not(autocvar_teamplay && cvar("g_telefrags_teamplay") && head.team == player.team)
+                       if not(teams_matter && cvar("g_telefrags_teamplay") && head.team == player.team)
                        {
                                if(head.classname == "player")
                                        if(head.health >= 1)

diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index f4738fa0d8033b2051942b6b5ecf5d69a66d5213..3561c8ca0fb7dee70a26a607932a74768f319d21 100644 (file)
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -609,7 +609,7 @@ void turret_think()
     self.nextthink = time + self.ticrate;
 
     // ONS uses somewhat backwards linking.
-    if (autocvar_teamplay)
+    if (teams_matter)
     {
         if not (g_onslaught)
             if (self.target)
@@ -918,7 +918,7 @@ float turret_stdproc_init (string cvar_base_name, float csqc_shared, string base
         if not (self.team)
             self.team = 14; // Assume turrets are on the defending side if not explicitly set otehrwize
     }
-    else if not (autocvar_teamplay)
+    else if not (teams_matter)
                self.team = MAX_SHOT_DISTANCE; // Group all turrets into the same team, so they dont kill eachother.
        else if(g_onslaught && self.targetname)
        {

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index bd7597110225eeb42afb9c733925c2897a1f121c..424093b93ba68419c96795ac1407a01b5abd6121 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -295,7 +295,7 @@ void raptor_enter()
     if (clienttype(other) != CLIENTTYPE_REAL)
         return;
 
-    if(autocvar_teamplay)
+    if(teams_matter)
         if(self.team)
             if(self.team != other.team)
                 return;

diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index ff43dea21ccb14ef68f188a7b584115ab40bc504..5bbc67c564fee9909c2bfb9144cab9e8250b8042 100644 (file)
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -430,7 +430,7 @@ void spiderbot_enter()
 
     self.colormod = self.tur_head.colormod = '0 0 0';
 
-    if(autocvar_teamplay)
+    if(teams_matter)
     if(self.team)
     if(self.team != other.team)
         return;
@@ -533,7 +533,7 @@ void spiderbot_exit(float eject)
        self.colormap            = 1024;
        self.tur_head.colormap   = 1024;
 
-    if not (autocvar_teamplay)
+    if not (teams_matter)
         self.team                = 0;
     else
     {
@@ -697,7 +697,7 @@ void vewhicle_spiderbot_dinit()
     tracebox(self.origin + '0 0 100', spiderbot_MIN, spiderbot_MAX, self.origin - '0 0 10000', MOVE_WORLDONLY, self);
     setorigin(self.spiderbot_spawnpnt,trace_endpos);
 
-    if(self.team && !autocvar_teamplay)
+    if(self.team && !teams_matter)
         self.team = 0;
     else
         self.spiderbot_spawnpnt.team = self.team;

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 93e8bfde4d49ea2c7cbcc5c664e81c2320b32d64..2c997cd39c7c4c6d17699ee7cd6d713007853293 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -43,7 +43,7 @@ void W_MinstaNex_Attack (void)
        // teamcolor / hit beam effect
        vector v;
        v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-       if(autocvar_teamplay)
+       if(teams_matter)
        {
            switch(self.team)
            {

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index a1b764db0ea220f57ab82599f69294198b70dd25..c9cfdc4a49951c1f848394f1c727132717bb5490 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -46,7 +46,7 @@ float Tuba_GetNote(entity pl, float hittype)
        
        // we support two kinds of tubas, those tuned in Eb and those tuned in C
        // kind of tuba currently is player slot number, or team number if in
-       // autocvar_teamplay
+       // teamplay
        // that way, holes in the range of notes are "plugged"
        if(teams_matter)
        {