X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_impulse.qc;h=c9896bc74591a8b3263c7e4884cca106c6ca3a49;hb=ffc8306348654f791a14dfb6ffe918083067244c;hp=c6ede7f981fad61358c959dd02eeefe4d05ca118;hpb=2b89f5bdd3be253aa44320dc71f70f283df3b5ee;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index c6ede7f98..c9896bc74 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -68,8 +68,8 @@ void ImpulseCommands (void)
 		// weapon switching impulses
 		if(self.deadflag == DEAD_NO)
 			W_NextWeaponOnImpulse(imp);
-		//else
-		//	self.impulse = imp; // retry in next frame
+		else
+			self.impulse = imp; // retry in next frame
 	}
 	else if(imp >= 10 && imp <= 20)
 	{
@@ -78,37 +78,37 @@ void ImpulseCommands (void)
 			switch(imp)
 			{
 				case 10:
-					W_NextWeapon(0);
+					W_NextWeapon (0);
 					break;
 				case 11:
 					W_LastWeapon();
 					break;
 				case 12:
-					W_PreviousWeapon(0);
+					W_PreviousWeapon (0);
 					break;
 				case 13:
-					W_SwitchWeapon(w_getbestweapon(self));
+					W_SwitchWeapon (w_getbestweapon(self));
 					break;
 				case 14:
 					W_NextWeaponOnImpulse(0);
 					break;
 				case 15:
-					W_NextWeapon(2);
+					W_NextWeapon (2);
 					break;
 				case 16:
-					W_PreviousWeapon(2);
+					W_PreviousWeapon (2);
 					break;
 				case 17:
 					W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
 					break;
 				case 18:
-					W_NextWeapon(1);
+					W_NextWeapon (1);
 					break;
 				case 19:
-					W_PreviousWeapon(1);
+					W_PreviousWeapon (1);
 					break;
 				case 20:
-					WEP_ACTION(self.weapon, WR_RELOAD);
+					W_TriggerReload ();
 					break;
 			}
 		}