X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=83c3f448a2ec802378a09d238b62d0afdcf26de1;hb=87b1a8def06bcf477cb8dbd1b5e069c29ce0ab91;hp=51b373fb796c490283333dca934cfd22d661147e;hpb=97b5964df72e50080f2aff5fe0f811f9656acdb7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 51b373fb7..83c3f448a 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -333,10 +333,10 @@ void CSQCPlayer_FallbackFrame_PostUpdate(bool isnew) // player "pops in" if(isnew) { -#define FIX_FRAMETIME(f,ft) do { \ +#define FIX_FRAMETIME(f,ft) MACRO_BEGIN { \ if(IS_DEAD_FRAME(self.f) && self.ft != 0 && self.death_time != 0) \ self.ft = self.death_time; \ -} while(0) +} MACRO_END FIX_FRAMETIME(frame, frame1time); FIX_FRAMETIME(frame2, frame2time); #ifdef CSQCMODEL_HAVE_TWO_FRAMES @@ -348,7 +348,7 @@ void CSQCPlayer_FallbackFrame_PostUpdate(bool isnew) } void CSQCPlayer_AnimDecide_PostUpdate(bool isnew) {SELFPARAM(); - self.csqcmodel_isdead = !!(self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2)); + self.csqcmodel_isdead = boolean(self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2)); } int CSQCPlayer_FallbackFrame(int f) {SELFPARAM();