]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/mrbougo/weaplast_on_spawn'
authorSamual <samual@xonotic.org>
Mon, 26 Sep 2011 00:21:32 +0000 (20:21 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 00:21:32 +0000 (20:21 -0400)
1  2 
qcsrc/server/cl_client.qc

index 7adab90f38cac27a90126d7e3fc3b460c45358ce,f14a259c9218d01ddd5d9fd7d7f3941108bf378e..bddb5933233ba91f7d422a85820852276344722e
@@@ -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)