[nexuiz-commits] r6330 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-27 08:51:25 -0400 (Fri, 27 Mar 2009)
New Revision: 6330

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
now REALLY make sure jetpack sound turns off


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-03-27 12:48:37 UTC (rev 6329)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-03-27 12:51:25 UTC (rev 6330)
@@ -1578,6 +1578,22 @@
 
 void player_powerups (void)
 {
+	if((self.items & IT_USING_JETPACK) && !self.deadflag)
+	{
+		SoundEntity_StartSound(self, CHAN_PLAYER, "misc/jetpack_fly.wav", VOL_BASE, ATTN_IDLE);
+		self.modelflags |= MF_ROCKET;
+	}
+	else
+	{
+		SoundEntity_StopSound(self, CHAN_PLAYER);
+		self.modelflags &~= MF_ROCKET;
+	}
+
+	self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
+
+	if(!self.modelindex || self.deadflag) // don't apply the flags if the player is gibbed
+		return;
+
 	if (g_minstagib)
 	{
 		if (self.items & IT_STRENGTH)
@@ -1620,22 +1636,6 @@
 		return;
 	}
 
-	self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
-
-	if(self.items & IT_USING_JETPACK)
-	{
-		SoundEntity_StartSound(self, CHAN_PLAYER, "misc/jetpack_fly.wav", VOL_BASE, ATTN_IDLE);
-		self.modelflags |= MF_ROCKET;
-	}
-	else
-	{
-		SoundEntity_StopSound(self, CHAN_PLAYER);
-		self.modelflags &~= MF_ROCKET;
-	}
-
-	if(!self.modelindex) // don't apply the flags if the player is gibbed
-		return;
-
 	if (self.items & IT_STRENGTH)
 	{
 		self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
@@ -2211,6 +2211,8 @@
 			self.fixangle = TRUE;
 		}
 
+		player_powerups();
+
 		if (self.deadflag != DEAD_NO)
 		{
 			float button_pressed, force_respawn;
@@ -2337,7 +2339,6 @@
 		if(frametime)
 			W_WeaponFrame();
 
-		player_powerups();
 		player_regen();
 		if(frametime)
 			player_anim();