From 9aca3326c5a1170b8e9af43f089d572e3a9eb9c6 Mon Sep 17 00:00:00 2001 From: Freddy <schro.sb@gmail.com> Date: Mon, 10 Oct 2016 17:35:32 +0200 Subject: [PATCH] Remove g_overkill_superguns_respawn_time Instead use g_pickup_respawntime_superweapon like other superweapons --- mutators.cfg | 1 - qcsrc/common/mutators/mutator/overkill/sv_overkill.qc | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mutators.cfg b/mutators.cfg index 2cf382a02e..2a5efcfda4 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -48,7 +48,6 @@ set g_overkill 0 "enable overkill" set g_overkill_100a_anyway 1 set g_overkill_100h_anyway 1 set g_overkill_powerups_replace 1 -set g_overkill_superguns_respawn_time 120 set g_overkill_ammo_charge 0 set g_overkill_ammo_charge_notice 1 diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index f86c71b7eb..35370df7ed 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -4,7 +4,6 @@ #include "rpc.qh" bool autocvar_g_overkill_powerups_replace; -float autocvar_g_overkill_superguns_respawn_time; bool autocvar_g_overkill_100h_anyway; bool autocvar_g_overkill_100a_anyway; bool autocvar_g_overkill_ammo_charge; @@ -274,7 +273,7 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) wep.noalign = ent.noalign; wep.cnt = ent.cnt; wep.team = ent.team; - wep.respawntime = autocvar_g_overkill_superguns_respawn_time; + wep.respawntime = g_pickup_respawntime_superweapon; wep.pickup_anyway = true; wep.spawnfunc_checked = true; setthink(wep, self_spawnfunc_weapon_hmg); @@ -291,7 +290,7 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) wep.noalign = ent.noalign; wep.cnt = ent.cnt; wep.team = ent.team; - wep.respawntime = autocvar_g_overkill_superguns_respawn_time; + wep.respawntime = g_pickup_respawntime_superweapon; wep.pickup_anyway = true; wep.spawnfunc_checked = true; setthink(wep, self_spawnfunc_weapon_rpc); -- 2.39.5