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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / instagib / sv_instagib.qc

diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
index 2131228ebf2e47a13a7676b0e09d5c9fad16caac..7b270f32f602a38afe8249e511a49bcc142f93f6 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
@@ -297,11 +297,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, SetWeaponArena)
 void replace_with_insta_cells(entity item)
 {
        entity e = new(item_vaporizer_cells);
-       setorigin(e, item.origin);
-       e.noalign = Item_ShouldKeepPosition(item);
-       e.cnt = item.cnt;
-       e.team = item.team;
-       e.spawnfunc_checked = true;
+       Item_CopyFields(item, e);
        spawnfunc_item_vaporizer_cells(e);
 }
 
@@ -438,10 +434,8 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, OnEntityPreSpawn)
                setthink(e, instagib_speed);
        }
 
+       Item_CopyFields(ent, e);
        e.nextthink = time + 0.1;
-       e.spawnflags = ent.spawnflags;
-       e.noalign = ent.noalign;
-       setorigin(e, ent.origin);
 
        return true;
 }