More fixes/cleanups

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0c525d7973fd500740ad5ffe47f934e739ef9f62..34ebb314213a64716843b249b8e6024cd312940d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -608,7 +608,7 @@ set g_ctf_flag_return_when_unreachable 1 "automatically return the flag if it fa
 set g_ctf_throw_velocity 500 "how far a player can throw the flag"
 set g_ctf_allow_pass 1 "allow passing of flags to nearby team mates"
 set g_ctf_pass_radius 200 "maximum radius that you can pass to a team mate in"
-set g_Ctf_dropped_capture_radius 100 "allow dropped flags to be automatically captured by base flags if the dropped flag is within this radius of it"
+set g_ctf_dropped_capture_radius 100 "allow dropped flags to be automatically captured by base flags if the dropped flag is within this radius of it"
 
 
 set g_ctf_shield_max_ratio 0   "shield at most this percentage of a team from the enemy flag (try: 0.4 for 40%)"

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 807829ebb2ba9bc292623e9018ba7ea19db00c27..a309f68dbd5af2a6e3c4962e7e3a28dc94c695c2 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -20,7 +20,6 @@ float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minsta
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
-float g_ctf_ignore_frags;
 float g_race_qualifying;
 float inWarmupStage;
 float g_pickup_respawntime_weapon;

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 0acb4adf762061e8d1ba9f7f8b93e3fe74d3dd2c..7c5afac8a68e0a3e2a63eac14bf197511498d2ae 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -209,11 +209,6 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype)
                        }
                        f = 0;
                }
-               else if(g_ctf) // FIXCTF
-               {
-                       if(g_ctf_ignore_frags)
-                               f = 0;
-               }
        }
 
        attacker.totalfrags += f;

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 87c372b36109c0a99a83d14747dbb24c28892da1..b0782d5fed7207c5f67668ce3cb06b0ee9642881 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -848,7 +848,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerDamage) // for changing damage and force values t
 MUTATOR_HOOKFUNCTION(ctf_GiveFragsForKill)
 {
        frag_score = 0; // no frags counted in ctf
-       return (g_ctf_ignore_frags); // you deceptive little bugger ;3 This needs to be true in order for this function to even count. 
+       return (autocvar_g_ctf_ignore_frags); // you deceptive little bugger ;3 This needs to be true in order for this function to even count. 
 }
 
 MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey)

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index e23ccff15a0ebcf25cec6cc1b66a104c28b1d354..de6fe352a4bc3c1d7327dee2ed482df2afc57a1f 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -157,7 +157,6 @@ void InitGameplayMode()
        if(g_ctf)
        {
                ActivateTeamplay();
-               g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
                fraglimit_override = autocvar_capturelimit_override;
                leadlimit_override = autocvar_captureleadlimit_override;
                MUTATOR_ADD(gamemode_ctf);