From 59fa70cc58ef2fd0391c5c2bd6c802bd26eb47d2 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sat, 14 Feb 2015 12:18:39 +0000 Subject: [PATCH] Amend previous commit. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5007 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 792ea3c73..8a5b17c68 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -7395,18 +7395,15 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo Bassert(i >= 0); - if (s->statnum != STAT_ACTOR && s->picnum == APLAYER && s->owner >= 0) + const DukePlayer_t *const ps = (s->statnum != STAT_ACTOR && s->picnum == APLAYER && s->owner >= 0) ? g_player[P_GetP((const spritetype *)s)].ps : NULL; + if (ps && ps->newowner == -1) { - const DukePlayer_t *const ps = g_player[P_GetP((const spritetype *)s)].ps; - if (ps->newowner == -1) - { - t->x -= mulscale16(65536-smoothratio,ps->pos.x-ps->opos.x); - t->y -= mulscale16(65536-smoothratio,ps->pos.y-ps->opos.y); - // dirty hack - if (ps->dead_flag) t->z = ps->opos.z; - t->z += mulscale16(smoothratio,ps->pos.z-ps->opos.z) - - (ps->dead_flag ? 0 : PHEIGHT) + PHEIGHT; - } + t->x -= mulscale16(65536-smoothratio,ps->pos.x-ps->opos.x); + t->y -= mulscale16(65536-smoothratio,ps->pos.y-ps->opos.y); + // dirty hack + if (ps->dead_flag) t->z = ps->opos.z; + t->z += mulscale16(smoothratio,ps->pos.z-ps->opos.z) - + (ps->dead_flag ? 0 : PHEIGHT) + PHEIGHT; } else if ((s->statnum == STAT_DEFAULT && s->picnum != CRANEPOLE) || s->statnum == STAT_PLAYER || s->statnum == STAT_STANDABLE || s->statnum == STAT_PROJECTILE || s->statnum == STAT_MISC || s->statnum == STAT_ACTOR)