From 19276004fe2dbff92cc9c95c2038fb8c5867d7ae Mon Sep 17 00:00:00 2001 From: Lyberta Date: Sat, 13 Jan 2018 06:38:37 +0300 Subject: [PATCH] Fixed RPC not spawning in Overkill. --- .../mutators/mutator/overkill/sv_overkill.qc | 82 ++++++++----------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 5eef8f2e3..2b9dcd550 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -189,51 +189,6 @@ MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect) } } -void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); } -void self_spawnfunc_weapon_rpc(entity this) { spawnfunc_weapon_rpc(this); } - -MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) -{ - entity ent = M_ARGV(0, entity); - - if(autocvar_g_powerups) - if(autocvar_g_overkill_powerups_replace) - { - if(ent.classname == "item_strength") - { - entity wep = new(weapon_hmg); - setorigin(wep, ent.origin); - setmodel(wep, MDL_OK_HMG); - wep.ok_item = true; - wep.noalign = Item_ShouldKeepPosition(ent); - wep.cnt = ent.cnt; - wep.team = ent.team; - wep.respawntime = g_pickup_respawntime_superweapon; - wep.pickup_anyway = true; - wep.spawnfunc_checked = true; - setthink(wep, self_spawnfunc_weapon_hmg); - wep.nextthink = time + 0.1; - return true; - } - else if(ent.classname == "item_shield") - { - entity wep = new(weapon_rpc); - setorigin(wep, ent.origin); - setmodel(wep, MDL_OK_RPC); - wep.ok_item = true; - wep.noalign = Item_ShouldKeepPosition(ent); - wep.cnt = ent.cnt; - wep.team = ent.team; - wep.respawntime = g_pickup_respawntime_superweapon; - wep.pickup_anyway = true; - wep.spawnfunc_checked = true; - setthink(wep, self_spawnfunc_weapon_rpc); - wep.nextthink = time + 0.1; - return true; - } - } -} - bool ok_HandleItemWaypoints(entity e) { if(!autocvar_g_overkill_itemwaypoints) @@ -266,9 +221,42 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) { entity item = M_ARGV(0, entity); - if(item.ok_item) + if (item.ok_item) + { return false; - + } + if (!autocvar_g_powerups || !autocvar_g_overkill_powerups_replace) + { + return true; + } + if (item.classname == "item_strength") + { + entity wep = new(weapon_hmg); + setorigin(wep, item.origin); + wep.ok_item = true; + wep.noalign = Item_ShouldKeepPosition(item); + wep.cnt = item.cnt; + wep.team = item.team; + wep.respawntime = g_pickup_respawntime_superweapon; + wep.pickup_anyway = true; + wep.spawnfunc_checked = true; + Item_Initialize(wep, "weapon_hmg"); + return true; + } + else if (item.classname == "item_shield") + { + entity wep = new(weapon_rpc); + setorigin(wep, item.origin); + wep.ok_item = true; + wep.noalign = Item_ShouldKeepPosition(item); + wep.cnt = item.cnt; + wep.team = item.team; + wep.respawntime = g_pickup_respawntime_superweapon; + wep.pickup_anyway = true; + wep.spawnfunc_checked = true; + Item_Initialize(wep, "weapon_rpc"); + return true; + } return true; } -- 2.39.2