From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 00:21:32 +0000 (-0400)
Subject: Merge remote branch 'origin/mrbougo/weaplast_on_spawn'
X-Git-Tag: xonotic-v0.6.0~40^2~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=17a8bb19afed00060ca20dac39df4b5a73ee3a42;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mrbougo/weaplast_on_spawn'
---

17a8bb19afed00060ca20dac39df4b5a73ee3a42
diff --cc qcsrc/server/cl_client.qc
index 7adab90f3,f14a259c9..bddb59332
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1110,9 -1107,8 +1108,9 @@@ void PutClientInServer (void
  		MUTATOR_CALLHOOK(PlayerSpawn);
  
  		self.switchweapon = w_getbestweapon(self);
- 		self.cnt = self.switchweapon;
+ 		self.cnt = -1; // W_LastWeapon will not complain
  		self.weapon = 0;
 +		self.weaponname = "";
  		self.switchingweapon = 0;
  
  		if(!self.alivetime)