X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=1dfc006c353d57ea8d6722a891097517703f5ed2;hp=06f66557a069722a10cc2190f102735df0fb0ebd;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=d325a439c88154aa1f827bf274cc1b45fa46e5dc

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 06f66557a0..1dfc006c35 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -341,10 +341,10 @@ void CSQCPlayer_FallbackFrame_PostUpdate(entity this, bool isnew)
 	// player "pops in"
 	if(isnew)
 	{
-#define FIX_FRAMETIME(f,ft) MACRO_BEGIN {																			\
-		if(IS_DEAD_FRAME(this.f) && this.ft != 0 && this.death_time != 0)											\
-			this.ft = this.death_time;																				\
-} MACRO_END
+#define FIX_FRAMETIME(f,ft) MACRO_BEGIN \
+		if(IS_DEAD_FRAME(this.f) && this.ft != 0 && this.death_time != 0) \
+			this.ft = this.death_time; \
+MACRO_END
 		FIX_FRAMETIME(frame, frame1time);
 		FIX_FRAMETIME(frame2, frame2time);
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
@@ -441,7 +441,7 @@ void CSQCModel_AutoTagIndex_Apply(entity this)
 							LOG_TRACE("h_ model lacks weapon attachment, but v_ model is attached to it");
 						}
 					}
-					else if(this.tag_entity.isplayermodel)
+					else if((this.tag_entity.isplayermodel & ISPLAYER_MODEL))
 					{
 						skeleton_loadinfo(this.tag_entity);
 						this.tag_index = this.tag_entity.bone_weapon;
@@ -604,12 +604,17 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer)
 	if(!this.modelindex || this.model == "null" || this.alpha < 0)
 	{
 		this.drawmask = 0;
+		if(this.snd_looping > 0)
+		{
+			sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_cl_jetpack_attenuation);
+			this.snd_looping = 0;
+		}
 		return;
 	}
 	else
 		this.drawmask = MASK_NORMAL;
 
-	if(this.isplayermodel && this.drawmask) // this checks if it's a player MODEL!
+	if((this.isplayermodel & ISPLAYER_MODEL) && this.drawmask) // this checks if it's a player MODEL!
 	{
 		CSQCPlayer_ModelAppearance_Apply(this, (this.isplayermodel & ISPLAYER_LOCAL));
 		CSQCPlayer_LOD_Apply(this);
@@ -700,7 +705,7 @@ void CSQCModel_Hook_PreUpdate(entity this, bool isnew, bool isplayer, bool isloc
 	this.iflags |= IFLAG_V_ANGLE_X;
 	// revert to values from server
 	CSQCModel_Effects_PreUpdate(this);
-	if(this.isplayermodel)
+	if((this.isplayermodel & ISPLAYER_MODEL))
 	{
 		if(!isplayer)
 			CSQCPlayer_FallbackFrame_PreUpdate(this);
@@ -716,7 +721,7 @@ void CSQCModel_Hook_PostUpdate(entity this, bool isnew, bool isplayer, bool islo
 	this.isplayermodel = BITSET(this.isplayermodel, ISPLAYER_MODEL, is_playermodel);
 
 	// save values set by server
-	if(this.isplayermodel)
+	if((this.isplayermodel & ISPLAYER_MODEL))
 	{
 		CSQCPlayer_ModelAppearance_PostUpdate(this);
 		if(isplayer)