From: Jakob MG <jakob_mg@hotmail.com>
Date: Mon, 11 Jun 2012 10:44:21 +0000 (+0200)
Subject: More robustly prevent http://dev.xonotic.org/issues/1237
X-Git-Tag: xonotic-v0.7.0~312^2~27
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d2c8916a51d276a5abdf79458d149ba8619b440f

More robustly prevent http://dev.xonotic.org/issues/1237
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 59efb74d5..236c0923f 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -318,7 +318,9 @@ float W_IsWeaponThrowable(float w)
 		return 0;
 	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
 		return 0;
-
+    if(w == 0)
+        return 0;
+	
 	wa = W_AmmoItemCode(w);
 	if(WEPSET_CONTAINS_AW(start_weapons, w))
 	{
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 530e5cf1b..2e7b9bfba 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -155,7 +155,7 @@ void ItemRead(float _IsNew)
         
         
         if(self.mdl == "")
-            dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, "exspect a crash just aboute now\n");
+            dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n");
         
         precache_model(self.mdl);
         setmodel(self, self.mdl);
@@ -967,11 +967,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 	
 	if(self.model == "")
     {
-        dprint("^1Tried to spawn ", itemname, " with no model!\n");
+        error(strcat("^1Tried to spawn ", itemname, " with no model!\n"));
         return;
     }
         
-	
 	if(self.item_pickupsound == "")
 		self.item_pickupsound = pickupsound;