Remove g_pickup_items hack (ugly & not needed with mutator hooks)

diff --git a/overkill.cfg b/overkill.cfg
index 1eff76a4a0a3093ce88b1f8540d6a61a78d0183c..3b1de4e7ad2f230a0f6db3247dd6b625504ddcf4 100644 (file)
--- a/overkill.cfg
+++ b/overkill.cfg
@@ -6,7 +6,6 @@ g_overkill_ammo_regen 2.52
 g_overkill_superguns_builtin 0
 
 g_use_ammunition 1
-g_pickup_items 0
 sv_gibhealth 120
 g_spawnshieldtime 0.5
 

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 89f95300c5277e3e2d5ad189be59868c3300b6e1..e1208f84a68d1b2375ecbfd802cf7aa21e313f91 100644 (file)
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -36,6 +36,38 @@ float ok_CheckWeaponCharge(entity ent, float wep)
        return !(ent.ammo_charge[wep] < cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
 }
 
+void start_hmg()
+{
+       self.classname = "weapon_hmg";
+       self.respawntime = autocvar_g_overkill_superguns_respawn_time;
+       self.ok_item = TRUE;
+       setmodel(self, "models/weapons/g_ok_hmg.md3");
+       spawnfunc_weapon_hmg();
+}
+
+void start_rpc()
+{
+       self.classname = "weapon_rpc";
+       self.respawntime = autocvar_g_overkill_superguns_respawn_time;
+       self.ok_item = TRUE;
+       setmodel(self, "models/weapons/g_ok_rl.md3");
+       spawnfunc_weapon_rpc();
+}
+
+void start_mh_anyway()
+{
+       self.classname = "item_health_mega";
+       self.ok_item = TRUE;
+       spawnfunc_item_health_mega();
+}
+
+void start_ma_anyway()
+{
+       self.classname = "item_armor_large";
+       self.ok_item = TRUE;
+       spawnfunc_item_armor_large();
+}
+
 MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Calculate)
 {
        if(DEATH_ISWEAPON(frag_deathtype, WEP_LASER) && frag_target == frag_attacker)
@@ -74,9 +106,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
        self.ok_deathloc = self.origin;
 
        entity oldself = self;
-       float gpi = autocvar_g_pickup_items;
        
-       cvar_set("g_pickup_items", "1");
        self = spawn();
        self.ok_item = TRUE;
        self.noalign = TRUE;
@@ -89,7 +119,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
        self.classname = "droppedweapon"; // hax
        SUB_SetFade(self, time + 5, 1);
        self = oldself;
-       cvar_set("g_pickup_items", ftos(gpi));
 
        return FALSE;
 }
@@ -166,49 +195,6 @@ MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
        return FALSE;
 }
 
-void start_hmg()
-{
-       float gpi = autocvar_g_pickup_items;
-       cvar_set("g_pickup_items", "1");
-       self.classname = "weapon_hmg";
-       self.ok_item = TRUE;
-       self.respawntime = autocvar_g_overkill_superguns_respawn_time;
-       setmodel(self, "models/weapons/g_ok_hmg.md3");
-       spawnfunc_weapon_hmg();
-
-       cvar_set("g_pickup_items", ftos(gpi));
-}
-
-void start_rpc()
-{
-       float gpi = autocvar_g_pickup_items;
-       cvar_set("g_pickup_items", "1");
-       self.classname = "weapon_rpc";
-       self.respawntime = autocvar_g_overkill_superguns_respawn_time;
-       self.ok_item = TRUE;
-       setmodel(self, "models/weapons/g_ok_rl.md3");
-       spawnfunc_weapon_rpc();
-       cvar_set("g_pickup_items", ftos(gpi));
-}
-
-void start_mh_anyway()
-{
-       cvar_set("g_pickup_items", "1");
-       self.classname = "item_health_mega";
-       self.ok_item = TRUE;
-       spawnfunc_item_health_mega();
-       cvar_set("g_pickup_items", "0");
-}
-
-void start_ma_anyway()
-{
-       cvar_set("g_pickup_items", "1");
-       self.classname = "item_armor_large";
-       self.ok_item = TRUE;
-       spawnfunc_item_armor_large();
-       cvar_set("g_pickup_items", "0");
-}
-
 MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 {
        if(autocvar_g_powerups)