From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 17 Dec 2010 17:49:03 +0000 (+0100)
Subject: no, let's use the "model" key. Should be safe. PLEASE TEST: does throwing weapons... 
X-Git-Tag: xonotic-v0.6.0~188^2~3^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77fc63b6c4ec6716ad1c0413e3f1bd17a202dcaa;p=xonotic%2Fxonotic-data.pk3dir.git

no, let's use the "model" key. Should be safe. PLEASE TEST: does throwing weapons still work?
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 2add9ba91..166aad589 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -843,8 +843,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 	self.bot_pickup = TRUE;
 	self.bot_pickupevalfunc = pickupevalfunc;
 	self.bot_pickupbasevalue = pickupbasevalue;
-	if(self.mdl == "")
+	if(self.model == "")
 		self.mdl = itemmodel;
+	else
+		self.mdl = self.model;
 	self.item_pickupsound = pickupsound;
 	// let mappers override respawntime
 	if(!self.respawntime) // both set