From: terencehill <piuntn@gmail.com>
Date: Sat, 10 Jul 2010 12:14:54 +0000 (+0200)
Subject: Fix wrong messages in the console (and in the weapons panel too) playing certain... 
X-Git-Tag: xonotic-v0.1.0preview~454^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11b0ebbe4afffc215f95db05201b9728b4fcc7a1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix wrong messages in the console (and in the weapons panel too) playing certain game modes, telling you "You do not have the weapon X" instead of "The weapon X is NOT AVAILABLE in this map", for really not available weapons.
It can be easily noticed in minstagib.
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 6f3347b5e..caa7c2119 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -795,8 +795,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 			self.is_item = TRUE;
 		}
 
-		weaponsInMap |= weaponid;
-
 		if(g_lms || g_ca)
 		{
 			startitem_failed = TRUE;
@@ -826,6 +824,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 			return;
 		}
 
+		weaponsInMap |= weaponid;
+
 		precache_model (itemmodel);
 		precache_sound (pickupsound);
 		precache_sound ("misc/itemrespawn.wav");