Tab fixes

This commit is contained in:
AJ Martinez 2023-06-12 15:15:25 -07:00
parent 76c783fe69
commit 530dd293cd
2 changed files with 29 additions and 29 deletions

View file

@ -5,38 +5,38 @@
void Obj_InstaWhipThink (mobj_t *whip)
{
if (P_MobjWasRemoved(whip->target))
{
P_RemoveMobj(whip);
}
else
{
mobj_t *mo = whip->target;
player_t *player = mo->player;
if (P_MobjWasRemoved(whip->target))
{
P_RemoveMobj(whip);
}
else
{
mobj_t *mo = whip->target;
player_t *player = mo->player;
// Follow player
whip->flags &= ~(MF_NOCLIPTHING);
P_SetScale(whip, whip->target->scale);
// Follow player
whip->flags &= ~(MF_NOCLIPTHING);
P_SetScale(whip, whip->target->scale);
P_MoveOrigin(whip, mo->x, mo->y, mo->z + mo->height/2);
whip->flags |= MF_NOCLIPTHING;
// Twirl
whip->angle = whip->target->angle + (ANG30 * 2 * whip->fuse);
whip->target->player->drawangle = whip->angle;
if (player->follower)
player->follower->angle = whip->angle;
player->pflags |= PF_GAINAX;
player->glanceDir = -2;
// Twirl
whip->angle = whip->target->angle + (ANG30 * 2 * whip->fuse);
whip->target->player->drawangle = whip->angle;
if (player->follower)
player->follower->angle = whip->angle;
player->pflags |= PF_GAINAX;
player->glanceDir = -2;
// Visuals
whip->renderflags |= RF_NOSPLATBILLBOARD|RF_FULLBRIGHT;
// Visuals
whip->renderflags |= RF_NOSPLATBILLBOARD|RF_FULLBRIGHT;
if (whip->renderflags & RF_DONTDRAW)
whip->renderflags &= ~RF_DONTDRAW;
else
whip->renderflags |= RF_DONTDRAW;
if (whip->renderflags & RF_DONTDRAW)
whip->renderflags &= ~RF_DONTDRAW;
else
whip->renderflags |= RF_DONTDRAW;
if (whip->extravalue2) // Whip has no hitbox but removing it is a pain in the ass
whip->renderflags |= RF_DONTDRAW;
}
if (whip->extravalue2) // Whip has no hitbox but removing it is a pain in the ass
whip->renderflags |= RF_DONTDRAW;
}
}

View file

@ -1322,11 +1322,11 @@ mobj_t *P_SpawnFakeShadow(mobj_t *mobj, UINT8 offset)
ghost->old_roll = mobj->old_roll2;
ghost->renderflags &= ~(RF_TRANSMASK|RF_FULLBRIGHT);
ghost->renderflags |= RF_ABSOLUTELIGHTLEVEL;
ghost->renderflags |= RF_ABSOLUTELIGHTLEVEL;
ghost->lightlevel = 0;
ghost->flags2 |= MF2_LINKDRAW;
P_SetTarget(&ghost->tracer, mobj);
P_SetTarget(&ghost->tracer, mobj);
return ghost;
}