X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_impulse.qc;h=3288bbc72a9af3b52cfcc56c64e44ddd8df4b4cd;hb=10d5434becc8bb7bdbced64619272bdc31c8056d;hp=41fb6cdb963422325261ea81887ff8417cd1ca31;hpb=d8e541e5cabb4e7981c0ab2e86f859440f0138f1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 41fb6cdb9..3288bbc72 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -46,9 +46,19 @@ void ImpulseCommands (void)
 		return;
 	self.impulse = 0;
 
-	if (timeout_status == TIMEOUT_ACTIVE) //don't allow any impulses while the game is paused
+	// forbid impulses when not in round time
+	if(round_handler_IsActive() && !round_handler_IsRoundStarted())
 		return;
 
+	if (timeout_status == TIMEOUT_ACTIVE) //don't allow any impulses while the game is paused
+		return;
+    
+    if(self.vehicle)
+        if(self.vehicle.deadflag == DEAD_NO)
+            if(self.vehicle.vehicles_impusle)
+                if(self.vehicle.vehicles_impusle(imp))
+                    return;
+    
 	if(CheatImpulse(imp))
 	{
 	}
@@ -88,8 +98,7 @@ void ImpulseCommands (void)
 					W_PreviousWeapon (2);
 					break;
 				case 17:
-					if (!g_minstagib)
-						W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
+					W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
 					break;
 				case 18:
 					W_NextWeapon (1);