From 54f5fedffc3159918d84275ce2ebe2b38dfcdb19 Mon Sep 17 00:00:00 2001 From: Samual Date: Sat, 31 Mar 2012 01:42:26 -0400 Subject: [PATCH] More fixes/cleanups --- defaultXonotic.cfg | 2 +- qcsrc/server/defs.qh | 1 - qcsrc/server/g_damage.qc | 5 ----- qcsrc/server/mutators/gamemode_ctf.qc | 2 +- qcsrc/server/teamplay.qc | 1 - 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 0c525d797..34ebb3142 100644 --- 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 807829ebb..a309f68db 100644 --- 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 0acb4adf7..7c5afac8a 100644 --- 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 87c372b36..b0782d5fe 100644 --- 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 e23ccff15..de6fe352a 100644 --- 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); -- 2.39.2