X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=a0641955609138a43fc1f396e6c6be54469ee716;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hp=c33c271fa21d52306bd46d92dc093c5166970b3a;hpb=8fdd6f852a81ab40e157d39cc3a56ecd0592f7b7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index c33c271fa2..a064195560 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 @@ -601,6 +601,11 @@ 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