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

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 09ed68993..a94ba2901 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -46,8 +46,8 @@ void ImpulseCommands (void)
 		return;
 	self.impulse = 0;
 
-	// forbid impulses when round is over (but not during the countdown to round start)
-	if(round_handler_IsActive() && round_handler_AwaitingNextRound())
+	// 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
@@ -98,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);
@@ -273,7 +272,7 @@ void ImpulseCommands (void)
 					for(e = findchain(classname, "waypoint"); e; e = e.chain)
 					{
 						e.colormod = '0.5 0.5 0.5';
-						e.effects &~= EF_NODEPTHTEST | EF_RED | EF_BLUE;
+						e.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
 					}
 					e2 = navigation_findnearestwaypoint(self, FALSE);
 					navigation_markroutes(e2);
@@ -319,7 +318,7 @@ void ImpulseCommands (void)
 						if(navigation_findnearestwaypoint(e, FALSE))
 						{
 							setorigin(e, org);
-							e.effects &~= EF_NODEPTHTEST;
+							e.effects &= ~EF_NODEPTHTEST;
 							e.model = "";
 						}
 						else
@@ -342,7 +341,7 @@ void ImpulseCommands (void)
 					start = findchainflags(flags, FL_ITEM);
 					for(e = start; e; e = e.chain)
 					{
-						e.effects &~= EF_NODEPTHTEST | EF_RED | EF_BLUE;
+						e.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
 						e.colormod = '0.5 0.5 0.5';
 					}
 					for(e = start; e; e = e.chain)