From 3b23ffed010929c4ba0bafb0bbc9d2381542af50 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 8 Apr 2008 00:33:58 +0000 Subject: [PATCH] pain overrides attacking git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1755 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/rendermodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/rendermodel.cpp b/source/src/rendermodel.cpp index 7bd704f0..413223cd 100644 --- a/source/src/rendermodel.cpp +++ b/source/src/rendermodel.cpp @@ -464,7 +464,7 @@ void renderclient(playerent *d, const char *mdlname, const char *vwepname, int t else if(d->state==CS_LAGGED) { anim = ANIM_SALUTE|ANIM_LOOP|ANIM_TRANSLUCENT; } else if(lastmillis-d->lastpain<300) { anim = d->crouching ? ANIM_CROUCH_PAIN : ANIM_PAIN; speed = 300.0f/4; varseed += d->lastpain; basetime = d->lastpain; } else if(!d->onfloor && d->timeinair>50) { anim = ANIM_JUMP|ANIM_END; } - else if(d->weaponsel==d->lastattackweapon && lastmillis-d->lastaction<300) { anim = d->crouching ? ANIM_CROUCH_ATTACK : ANIM_ATTACK; speed = 300.0f/8; basetime = d->lastaction; } + else if(d->weaponsel==d->lastattackweapon && lastmillis-d->lastaction<300 && d->lastpain < d->lastaction) { anim = d->crouching ? ANIM_CROUCH_ATTACK : ANIM_ATTACK; speed = 300.0f/8; basetime = d->lastaction; } else if(!d->move && !d->strafe) { anim = (d->crouching ? ANIM_CROUCH_IDLE : ANIM_IDLE)|ANIM_LOOP; } else { anim = (d->crouching ? ANIM_CROUCH_WALK : ANIM_RUN)|ANIM_LOOP; speed = 1860/d->maxspeed; } modelattach a[2];