Fix 2 autocvars not correctly declared as "var", rename autocvar_g_onslaught_controlp...

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 6cff7e5a42666ab32954c8ec8d5abb757b1a09f6..c03faef53c392387bd72c0c711f877359b03869d 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -405,6 +405,11 @@ set g_onslaught_cp_health 1000
 set g_onslaught_cp_buildhealth 100
 set g_onslaught_cp_buildtime 5
 set g_onslaught_cp_regen 20
+set g_onslaught_cp_proxydecap 0 "de-capture controlpoints by standing close to them"
+set g_onslaught_cp_proxydecap_distance 512
+set g_onslaught_cp_proxydecap_dps 100
+set g_onslaught_spawn_at_controlpoints 0
+set g_onslaught_spawn_at_generator 0
 
 
 // ======

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 671d75c49ce5ea56e708a05dcb76da2e493b1314..c14817e85129a1be14077c7b7c50eb71746b9d21 100644 (file)
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1,8 +1,8 @@
 float autocvar_g_onslaught_spawn_at_controlpoints;
 float autocvar_g_onslaught_spawn_at_generator;
-float autocvar_g_onslaught_controlpoints_proxycap;
-float autocvar_g_onslaught_controlpoints_proxycap_distance = 512;
-float autocvar_g_onslaught_controlpoints_proxycap_dps = 100;
+float autocvar_g_onslaught_cp_proxydecap;
+var float autocvar_g_onslaught_cp_proxydecap_distance = 512;
+var float autocvar_g_onslaught_cp_proxydecap_dps = 100;
 
 void onslaught_generator_updatesprite(entity e);
 void onslaught_controlpoint_updatesprite(entity e);
@@ -1074,9 +1074,9 @@ void onslaught_controlpoint_icon_think()
 {
        entity oself;
        self.nextthink = time + sys_frametime;
-       
-       if(autocvar_g_onslaught_controlpoints_proxycap)
-       {        
+
+       if(autocvar_g_onslaught_cp_proxydecap)
+       {
         float _enemy_count = 0;
         float _friendly_count = 0;
         float _dist;
@@ -1087,7 +1087,7 @@ void onslaught_controlpoint_icon_think()
             if(!_player.deadflag)
             {
                 _dist = vlen(_player.origin - self.origin);
-                if(_dist < autocvar_g_onslaught_controlpoints_proxycap_distance)
+                if(_dist < autocvar_g_onslaught_cp_proxydecap_distance)
                 {
                     if(_player.team == self.team)
                         ++_friendly_count;
@@ -1097,9 +1097,9 @@ void onslaught_controlpoint_icon_think()
             }
         }
 
-        _friendly_count = _friendly_count * (autocvar_g_onslaught_controlpoints_proxycap_dps * sys_frametime);
-        _enemy_count = _enemy_count * (autocvar_g_onslaught_controlpoints_proxycap_dps * sys_frametime);
-        
+        _friendly_count = _friendly_count * (autocvar_g_onslaught_cp_proxydecap_dps * sys_frametime);
+        _enemy_count = _enemy_count * (autocvar_g_onslaught_cp_proxydecap_dps * sys_frametime);
+
         self.health = bound(0, self.health + (_friendly_count - _enemy_count), self.max_health);
         if(self.health <= 0)
         {
@@ -1107,7 +1107,7 @@ void onslaught_controlpoint_icon_think()
             return;
         }
     }
-    
+
        if (time > self.pain_finished + 5)
        {
                if(self.health < self.max_health)