From: Rudolf Polzer Date: Mon, 9 Jan 2012 20:54:32 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/divVerent/allow-override-item-model' X-Git-Tag: xonotic-v0.6.0~188^2~3 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a7b24450e4c7ca75636df1375d01d2266bd00c8c;hp=ac51af716204959703e1d10f1c1ad1b2c60beafa 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 d255f8e338..52c14b2be9 100644 --- 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 79c39ae95d..46c7342f4e 100644 --- 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)