Merge branch 'pending-release' into Mario/survival

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / sv_overkill.qc

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 7b2459869d3c60b8de1edf542e16d07e5ce11f36..009acc355738fd80fd235d59e5a1bc3bae663d01 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -227,28 +227,20 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
        if (item.classname == "item_strength")
        {
                entity wep = new(weapon_okhmg);
-               setorigin(wep, item.origin);
+               Item_CopyFields(item, wep);
                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_okhmg"); // doesn't actually use spawnfunc
                return true;
        }
        else if (item.classname == "item_shield")
        {
                entity wep = new(weapon_okrpc);
-               setorigin(wep, item.origin);
+               Item_CopyFields(item, wep);
                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_okrpc"); // doesn't actually use spawnfunc
                return true;
        }