thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tab fixes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/objects/instawhip.c
View file

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

4
src/p_user.c
View file

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