X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hook.qc;h=f0310c702e7399967d3226758b217b0d44b06301;hb=26f37b6d480a3a276af0ab52ac340dd110186704;hp=923083387faf12a0ce8846a8ebf33256ddd05d4c;hpb=39380aa9e45dbc545f5fe241c0002ce65a6f635e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 923083387..f0310c702 100644
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -66,12 +66,12 @@ void W_Hook_Damage (entity inflictor, entity attacker, float damage, float death
 {
 	if (self.health <= 0)
 		return;
-		
+
 	if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
-		return; // g_projectiles_damage says to halt	
-	
+		return; // g_projectiles_damage says to halt
+
 	self.health = self.health - damage;
-	
+
 	if (self.health <= 0)
 		W_PrepareExplosionByDamage(self.realowner, W_Hook_Explode2);
 }
@@ -104,7 +104,7 @@ void W_Hook_Attack2()
 	gren.think = adaptor_think2use_hittype_splash;
 	gren.use = W_Hook_Explode2;
 	gren.touch = W_Hook_Touch2;
-	
+
 	gren.takedamage = DAMAGE_YES;
 	gren.health = autocvar_g_balance_hook_secondary_health;
 	gren.damageforcescale = autocvar_g_balance_hook_secondary_damageforcescale;
@@ -141,7 +141,7 @@ void spawnfunc_weapon_hook (void)
 float w_hook(float req)
 {
 	float hooked_time_max, hooked_fuel;
-		
+
 	if (req == WR_AIM)
 	{
 		// ... sorry ...
@@ -151,14 +151,14 @@ float w_hook(float req)
 		if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
 		{
 			if(!self.hook)
-			if not(self.hook_state & HOOK_WAITING_FOR_RELEASE)
-			if not(self.hook_state & HOOK_FIRING)
+			if (!(self.hook_state & HOOK_WAITING_FOR_RELEASE))
+			if (!(self.hook_state & HOOK_FIRING))
 			if (time > self.hook_refire)
 			if (weapon_prepareattack(0, -1))
 			{
 				W_DecreaseAmmo(ammo_fuel, autocvar_g_balance_hook_primary_fuel, FALSE);
 				self.hook_state |= HOOK_FIRING;
-				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hook_primary_animtime, w_ready);				
+				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hook_primary_animtime, w_ready);
 			}
 		}
 
@@ -177,25 +177,25 @@ float w_hook(float req)
 			self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_hook_primary_refire * W_WeaponRateFactor());
 
 			// hook also inhibits health regeneration, but only for 1 second
-			if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+			if (!(self.items & IT_UNLIMITED_WEAPON_AMMO))
 				self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_fuel_regen);
 		}
 
 		if(self.hook && self.hook.state == 1)
 		{
-			hooked_time_max = autocvar_g_balance_hook_primary_hooked_time_max;			
+			hooked_time_max = autocvar_g_balance_hook_primary_hooked_time_max;
 			if (hooked_time_max > 0)
 			{
 				if ( time > self.hook_time_hooked + hooked_time_max )
 					self.hook_state |= HOOK_REMOVING;
 			}
-			
+
 			hooked_fuel = autocvar_g_balance_hook_primary_hooked_fuel;
 			if (hooked_fuel > 0)
 			{
 				if ( time > self.hook_time_fueldecrease )
 				{
-					if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+					if (!(self.items & IT_UNLIMITED_WEAPON_AMMO))
 					{
 						if ( self.ammo_fuel >= (time - self.hook_time_fueldecrease) * hooked_fuel )
 						{
@@ -215,7 +215,7 @@ float w_hook(float req)
 		}
 		else
 		{
-			self.hook_time_hooked = time;				
+			self.hook_time_hooked = time;
 			self.hook_time_fueldecrease = time + autocvar_g_balance_hook_primary_hooked_time_free;
 		}