]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
try to detect isdead flag (please test)
authorRudolf Polzer <divverent@xonotic.org>
Thu, 2 May 2013 18:26:45 +0000 (20:26 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 2 May 2013 18:36:26 +0000 (20:36 +0200)
qcsrc/client/csqcmodel_hooks.qc

index a9f8410b4178a4006be7d0cc0659db8d4615425e..109b83d166f11a8efe597f1173c76c5cda1aef59 100644 (file)
@@ -313,6 +313,10 @@ void CSQCPlayer_FallbackFrame_PostUpdate(float isnew)
        }
        self.csqcmodel_isdead = IS_DEAD_FRAME(self.frame);
 }
+void CSQCPlayer_AnimDecide_PostUpdate(float isnew)
+{
+       self.csqcmodel_isdead = !!(self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2));
+}
 float CSQCPlayer_FallbackFrame(float f)
 {
        if(frameduration(self.modelindex, f) > 0)
@@ -692,7 +696,9 @@ void CSQCModel_Hook_PostUpdate(float isnew, float isplayer, float islocalplayer)
        if(self.isplayermodel)
        {
                CSQCPlayer_ForceModel_PostUpdate();
-               if(!isplayer)
+               if(isplayer)
+                       CSQCPlayer_AnimDecide_PostUpdate(isnew);
+               else
                        CSQCPlayer_FallbackFrame_PostUpdate(isnew);
        }
        CSQCModel_Effects_PostUpdate();