X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_impulse.qc;h=09ed68993ca4db9a4f28679ea590379ce42287c6;hb=6c3104a65005223002dfb708d4dec7481722c355;hp=9e211e5f504086be15b3c2bd7361262b946349fc;hpb=c28d67f351bd2df30ec7b43e88a1031d482b50b9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 9e211e5f5..09ed68993 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -35,7 +35,7 @@
 
 void ImpulseCommands (void)
 {
-	local float imp;
+	float imp;
 	vector org;
 	float i;
 	float m;
@@ -46,9 +46,19 @@ void ImpulseCommands (void)
 		return;
 	self.impulse = 0;
 
-	if (timeoutStatus == 2) //don't allow any impulses while the game is paused
+	// forbid impulses when round is over (but not during the countdown to round start)
+	if(round_handler_IsActive() && round_handler_AwaitingNextRound())
 		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))
 	{
 	}
@@ -159,11 +169,14 @@ void ImpulseCommands (void)
 			case 33:
 				if(self.deadflag == DEAD_NO && teamplay)
 				{
-					wp = WaypointSprite_Attach("helpme", TRUE, RADARICON_HELPME, '1 0.5 0');
-					if(!wp)
-						WaypointSprite_HelpMePing(self.waypointsprite_attachedforcarrier);
-					else
-						WaypointSprite_Ping(wp);
+					if not(MUTATOR_CALLHOOK(HelpMePing))
+					{
+						wp = WaypointSprite_Attach("helpme", TRUE, RADARICON_HELPME, '1 0.5 0');
+						if(!wp)
+							WaypointSprite_HelpMePing(self.waypointsprite_attachedforcarrier);
+						else
+							WaypointSprite_Ping(wp);
+					}
 					sprint(self, "HELP ME attached\n");
 				}
 				break;