Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_items.qc

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 79c39ae95d7998899e99529451df30ff22b05fed..46c7342f4ead3431f4a67995024da8339dab4740 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -736,6 +736,11 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
                        return;
                }
 
+               if(self.model != "")
+                       itemmodel = self.model;
+               if(self.item_pickupsound != "")
+                       pickupsound = self.item_pickupsound;
+
                self.reset = Item_Reset;
                // it's a level item
                if(self.spawnflags & 1)