From c8ac92a2c7c5f6caf9b6dda1c4e50e496b7f7e97 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sat, 8 Sep 2012 19:36:03 -0400 Subject: [PATCH] Remove some useless cvars and update the effects more --- gamemodes.cfg | 6 ++---- qcsrc/server/autocvars.qh | 2 -- qcsrc/server/mutators/gamemode_ctf.qc | 12 ++++-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/gamemodes.cfg b/gamemodes.cfg index 6616108b9..97fc55df4 100644 --- a/gamemodes.cfg +++ b/gamemodes.cfg @@ -183,8 +183,6 @@ set g_ctf_flagcarrier_forcefactor 1 set g_ctf_flagcarrier_waypointforenemy_stalemate 60 "show the enemy flagcarrier location after both teams have held the flags for this amount of time" set g_ctf_flagcarrier_waypointforenemy_spotting 1 "show the enemy flagcarrier location if a team mate presses +use to spot them" 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_fullbrightflags 0 -set g_ctf_dynamiclights 0 set g_ctf_flag_damageforcescale 2 set g_ctf_portalteleport 0 "allow flag carriers to go through portals made in portal gun without dropping the flag" set g_ctf_reverse 0 "if enabled, flags positions are switched: you have to capture the enemy's flag from your own base by bringing it to your own flag in the enemy base" @@ -215,8 +213,8 @@ set g_ctf_flag_red_skin 0 set g_ctf_flag_blue_model "models/ctf/flags.md3" set g_ctf_flag_blue_skin 1 set g_ctf_flag_glowtrails 0 -set g_ctf_flag_pickup_effects 1 -set g_ctf_flag_capture_effects 1 +set g_ctf_fullbrightflags 0 +set g_ctf_dynamiclights 0 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too" // CTF capture limit placeholder cvar diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index d1f644c2e..75a2e33c7 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -776,14 +776,12 @@ float autocvar_g_ctf_captimerecord_always; float autocvar_g_ctf_dynamiclights; string autocvar_g_ctf_flag_blue_model; float autocvar_g_ctf_flag_blue_skin; -float autocvar_g_ctf_flag_capture_effects; float autocvar_g_ctf_flag_collect_delay; float autocvar_g_ctf_flag_damageforcescale; float autocvar_g_ctf_flag_dropped_waypoint; float autocvar_g_ctf_flag_dropped_floatinwater; float autocvar_g_ctf_flag_glowtrails; float autocvar_g_ctf_flag_health; -float autocvar_g_ctf_flag_pickup_effects; float autocvar_g_ctf_flag_pickup_verbosename; string autocvar_g_ctf_flag_red_model; float autocvar_g_ctf_flag_red_skin; diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 134365f29..cd36823d7 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -370,11 +370,8 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype) PlayerScore_Add(player, SP_CTF_CAPTIME, new_time - old_time); // effects - if(autocvar_g_ctf_flag_capture_effects) - { - pointparticles(particleeffectnum(flag.capeffect), flag.origin, '0 0 0', 1); - //shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1); - } + pointparticles(particleeffectnum(flag.capeffect), flag.origin, '0 0 0', 1); + //shockwave_spawn("models/ctf/shockwavetransring.md3", flag.origin - '0 0 15', -0.8, 0, 1); // other if(capturetype == CAPTURE_NORMAL) @@ -479,7 +476,7 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) { pickup_dropped_score = (autocvar_g_ctf_flag_return_time ? bound(0, ((flag.ctf_droptime + autocvar_g_ctf_flag_return_time) - time) / autocvar_g_ctf_flag_return_time, 1) : 1); pickup_dropped_score = floor((autocvar_g_ctf_score_pickup_dropped_late * (1 - pickup_dropped_score) + autocvar_g_ctf_score_pickup_dropped_early * pickup_dropped_score) + 0.5); - print("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n"); + dprint("pickup_dropped_score is ", ftos(pickup_dropped_score), "\n"); PlayerTeamScore_AddScore(player, pickup_dropped_score); break; } @@ -496,8 +493,7 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) } // effects - if(autocvar_g_ctf_flag_pickup_effects) - pointparticles(particleeffectnum("smoke_ring"), 0.5 * (flag.absmin + flag.absmax), '0 0 0', 1); + pointparticles(particleeffectnum(flag.toucheffect), player.origin, '0 0 0', 1); // waypoints if(pickuptype == PICKUP_DROPPED) { WaypointSprite_Kill(flag.wps_flagdropped); } -- 2.39.2