Subversion Repositories eduke32

Rev

Rev 4997 | Rev 5007 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4997 Rev 5006
Line 7393... Line 7393...
7393
        if (t->statnum == TSPR_TEMP)
7393
        if (t->statnum == TSPR_TEMP)
7394
            continue;
7394
            continue;
7395
7395
7396
        Bassert(i >= 0);
7396
        Bassert(i >= 0);
7397
7397
-
 
7398
        if (s->statnum != STAT_ACTOR && s->picnum == APLAYER && s->owner >= 0)
7398
        {
7399
        {
7399
            int32_t snum = P_GetP((const spritetype *)s);
-
 
7400
            const DukePlayer_t *const ps = g_player[snum].ps;
7400
            const DukePlayer_t *const ps = g_player[P_GetP((const spritetype *)s)].ps;
7401
-
 
7402
            if (s->statnum != STAT_ACTOR && s->picnum == APLAYER && ps->newowner == -1 && s->owner >= 0)
7401
            if (ps->newowner == -1)
7403
            {
7402
            {
7404
                t->x -= mulscale16(65536-smoothratio,ps->pos.x-ps->opos.x);
7403
                t->x -= mulscale16(65536-smoothratio,ps->pos.x-ps->opos.x);
7405
                t->y -= mulscale16(65536-smoothratio,ps->pos.y-ps->opos.y);
7404
                t->y -= mulscale16(65536-smoothratio,ps->pos.y-ps->opos.y);
7406
                // dirty hack
7405
                // dirty hack
7407
                if (ps->dead_flag) t->z = ps->opos.z;
7406
                if (ps->dead_flag) t->z = ps->opos.z;
7408
                t->z += mulscale16(smoothratio,ps->pos.z-ps->opos.z) -
7407
                t->z += mulscale16(smoothratio,ps->pos.z-ps->opos.z) -
7409
                    (ps->dead_flag ? 0 : PHEIGHT) + PHEIGHT;
7408
                    (ps->dead_flag ? 0 : PHEIGHT) + PHEIGHT;
7410
            }
7409
            }
-
 
7410
        }
7411
            else if ((s->statnum == STAT_DEFAULT && s->picnum != CRANEPOLE) || s->statnum == STAT_PLAYER ||
7411
        else if ((s->statnum == STAT_DEFAULT && s->picnum != CRANEPOLE) || s->statnum == STAT_PLAYER ||
7412
                     s->statnum == STAT_STANDABLE || s->statnum == STAT_PROJECTILE || s->statnum == STAT_MISC || s->statnum == STAT_ACTOR)
7412
                 s->statnum == STAT_STANDABLE || s->statnum == STAT_PROJECTILE || s->statnum == STAT_MISC || s->statnum == STAT_ACTOR)
7413
            {
7413
        {
7414
                t->x -= mulscale16(65536-smoothratio,s->x-actor[i].bpos.x);
7414
            t->x -= mulscale16(65536-smoothratio,s->x-actor[i].bpos.x);
7415
                t->y -= mulscale16(65536-smoothratio,s->y-actor[i].bpos.y);
7415
            t->y -= mulscale16(65536-smoothratio,s->y-actor[i].bpos.y);
7416
                t->z -= mulscale16(65536-smoothratio,s->z-actor[i].bpos.z);
7416
            t->z -= mulscale16(65536-smoothratio,s->z-actor[i].bpos.z);
7417
            }
7417
        }
7418
        }
-
 
7419
7418
7420
        const int32_t sect = s->sectnum;
7419
        const int32_t sect = s->sectnum;
7421
7420
7422
        curframe = AC_CURFRAME(actor[i].t_data);
7421
        curframe = AC_CURFRAME(actor[i].t_data);
7423
#if !defined LUNATIC
7422
#if !defined LUNATIC