From: Mario <mario@smbclan.net>
Date: Wed, 4 Nov 2015 01:22:27 +0000 (+1000)
Subject: Don't retry next frame (was breaking some impulses when re-spawning)
X-Git-Tag: xonotic-v0.8.2~1732
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4f04f36d0f10577140d2bc96aa151412677c4d6;p=xonotic%2Fxonotic-data.pk3dir.git

Don't retry next frame (was breaking some impulses when re-spawning)
---

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 8b36e1753..9b4e61eed 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -145,8 +145,8 @@ void ImpulseCommands (void)
 					break;
 			}
 		}
-		else
-			self.impulse = imp; // retry in next frame
+		//else
+			//self.impulse = imp; // retry in next frame
 	}
 	else if(imp == 21)
 	{
@@ -162,16 +162,16 @@ void ImpulseCommands (void)
 			m = (imp - (210 + i)); // <0 for prev, =0 for best, >0 for next
 			W_CycleWeapon(self.(cvar_cl_weaponpriorities[i]), m);
 		}
-		else
-			self.impulse = imp; // retry in next frame
+		//else
+			//self.impulse = imp; // retry in next frame
 	}
 	else if(imp >= WEP_IMPULSE_BEGIN && imp <= WEP_IMPULSE_END)
 	{
 		if(!self.vehicle)
 		if(self.deadflag == DEAD_NO)
 			W_SwitchWeapon (imp - WEP_IMPULSE_BEGIN + WEP_FIRST);
-		else
-			self.impulse = imp; // retry in next frame
+		//else
+			//self.impulse = imp; // retry in next frame
 	}
 	// deploy waypoints
 	else if (imp >= 30 && imp <= 49)