Add a new function to copy fields from items to replacements, fixes #2792

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / random_items / sv_random_items.qc

diff --git a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
index 183808021b92ecdbdc2324a2431a5ecdbe135c9d..c0fa7ff9697b7f1dd3d004054e032cd5ae2ad6c2 100644 (file)
--- a/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
+++ b/qcsrc/common/mutators/mutator/random_items/sv_random_items.qc
@@ -269,6 +269,7 @@ entity RandomItems_ReplaceMapItem(entity item)
        entity new_item;
        if (!MUTATOR_IS_ENABLED(ok))
        {
+               // TODO: doesn't copy many fields from items
                new_item = Item_Create(strzone(new_classname), item.origin,
                        Item_ShouldKeepPosition(item));
                random_items_is_spawning = false;
@@ -280,9 +281,8 @@ entity RandomItems_ReplaceMapItem(entity item)
        else
        {
                new_item = spawn();
+               Item_CopyFields(item, new_item);
                new_item.classname = strzone(new_classname);
-               new_item.spawnfunc_checked = true;
-               new_item.noalign = Item_ShouldKeepPosition(item);
                new_item.ok_item = true;
                Item_Initialize(new_item, new_classname);
                random_items_is_spawning = false;
@@ -290,7 +290,6 @@ entity RandomItems_ReplaceMapItem(entity item)
                {
                        return NULL;
                }
-               setorigin(new_item, item.origin);
        }
        if (item.team)
        {