thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fault rework cleanup for merge

Browse source
This commit is contained in:
AJ Martinez 2023-02-13 15:31:39 -07:00
parent de268b744b
commit 32ea795639
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -581,7 +581,7 @@ struct player_t
tic_t ebrakefor; // Ebrake timer, used for visuals. tic_t ebrakefor; // Ebrake timer, used for visuals.
UINT16 faulttimer; // Used for misc FAULT visuals UINT16 faultflash; // Used for misc FAULT visuals
UINT32 roundscore; // battle score this round UINT32 roundscore; // battle score this round
UINT8 emeralds; UINT8 emeralds;

2
src/k_respawn.c
View file

@ -279,7 +279,7 @@ void K_DoIngameRespawn(player_t *player)
player->respawn.init = true; player->respawn.init = true;
player->respawn.airtimer = player->airtime; player->respawn.airtimer = player->airtime;
player->respawn.truedeath = player->pflags & PF_FAULT; player->respawn.truedeath = !!(player->pflags & PF_FAULT);
} }
/*-------------------------------------------------- /*--------------------------------------------------

6
src/p_mobj.c
View file

@ -9805,15 +9805,15 @@ void P_MobjThinker(mobj_t *mobj)
mobj->eflags |= MFE_PAUSED; mobj->eflags |= MFE_PAUSED;
mobj->hitlag--; mobj->hitlag--;
if (mobj->type == MT_PLAYER && mobj->player->faulttimer > 0) if (mobj->player != NULL && mobj->player->faultflash > 0)
{ {
ClearFakePlayerSkin(mobj->player); ClearFakePlayerSkin(mobj->player);
if (mobj->player->faulttimer & 1) if (mobj->player->faultflash & 1)
mobj->renderflags |= RF_DONTDRAW; mobj->renderflags |= RF_DONTDRAW;
else else
mobj->renderflags &= ~RF_DONTDRAW; mobj->renderflags &= ~RF_DONTDRAW;
mobj->player->faulttimer--; mobj->player->faultflash--;
} }
if (mobj->type == MT_DROPTARGET && mobj->reactiontime > 0 && mobj->hitlag == 2) if (mobj->type == MT_DROPTARGET && mobj->reactiontime > 0 && mobj->hitlag == 2)

2
src/p_spec.c
View file

@ -1918,7 +1918,7 @@ static void K_HandleLapIncrement(player_t *player)
player->hyudorotimer = UINT16_MAX; player->hyudorotimer = UINT16_MAX;
player->speed = 0; player->speed = 0;
K_StripItems(player); K_StripItems(player);
player->faulttimer = TICRATE/3; player->faultflash = TICRATE/3;
ClearFakePlayerSkin(player); ClearFakePlayerSkin(player);
S_StartSound(player->mo, sfx_s3k8a); S_StartSound(player->mo, sfx_s3k8a);
P_MoveOrigin(player->mo, player->mo->old_x, player->mo->old_y, player->mo->z); P_MoveOrigin(player->mo, player->mo->old_x, player->mo->old_y, player->mo->z);

9
src/p_user.c
View file

@ -4208,9 +4208,12 @@ void P_PlayerThink(player_t *player)
{ {
if (!(--player->nocontrol)) if (!(--player->nocontrol))
{ {
player->pflags &= ~PF_FAULT; if (player->pflags & PF_FAULT)
player->mo->renderflags &= ~RF_DONTDRAW; {
player->mo->flags &= ~MF_NOCLIPTHING; player->pflags &= ~PF_FAULT;
player->mo->renderflags &= ~RF_DONTDRAW;
player->mo->flags &= ~MF_NOCLIPTHING;
}
} }
} }
else else