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

Conflicts:
	qcsrc/server/t_items.qc

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d255f8e338ac656bbe6cae29ed39e2fe38c2dcf1..52c14b2be90d9f41000144d0ad6a9060b27e3e35 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -438,7 +438,7 @@ set bot_ai_aimskill_order_filter_5th 0.5 "Movement prediction filter. Used rarel
 
 // waypoint editor enable
 set g_waypointeditor 0
-set g_waypointeditor_auto 0 "Automatically create waypoints for bots while playing"
+set g_waypointeditor_auto 0 "Automatically create waypoints for bots while playing; BEWARE, this currently creates too many of them"
 set bot_ignore_bots 0  "When set, bots don't shoot at other bots"
 set bot_join_empty 0   "When set, bots also play if no player has joined the server"
 set bot_vs_human 0     "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count). Changes will be correctly applied only from the next game"

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)