From: Rudolf Polzer <divverent@alientrap.org>
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: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a7b24450e4c7ca75636df1375d01d2266bd00c8c;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/t_items.qc
---

a7b24450e4c7ca75636df1375d01d2266bd00c8c
diff --cc defaultXonotic.cfg
index d255f8e33,18ce4a988..52c14b2be
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -438,7 -447,6 +438,7 @@@ set bot_ai_aimskill_order_filter_5th 0.
  
  // 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 --cc qcsrc/server/t_items.qc
index 79c39ae95,2ca9162f8..46c7342f4
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -729,13 -712,11 +729,18 @@@ void StartItem (string itemmodel, strin
  			return;
  		}
  
 +		if(!have_pickup_item())
 +		{
 +			startitem_failed = TRUE;
 +			remove (self);
 +			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)