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

Remove PF_SKIDDOWN, just use PF_FAULT

Browse source
This commit is contained in:
James R 2020-08-06 17:59:09 -07:00
parent 3332c22801
commit 11a4ca28d7
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_player.h
View file

@ -113,7 +113,8 @@ typedef enum
// Spill rings after falling
PF_NIGHTSFALL = 1<<24,
PF_DRILLING = 1<<25,
PF_SKIDDOWN = 1<<26,
// free: 1<<26
/*** TAG STUFF ***/
PF_TAGGED = 1<<27, // Player has been tagged and awaits the next round in hide and seek.

3
src/dehacked.c
View file

@ -8569,7 +8569,8 @@ static const char *const PLAYERFLAG_LIST[] = {
// Spill rings after falling
"NIGHTSFALL",
"DRILLING",
"SKIDDOWN",
"\x01", // free: 1<<26 (name un-matchable)
/*** TAG STUFF ***/
"TAGGED", // Player has been tagged and awaits the next round in hide and seek.

4
src/k_kart.c
View file

@ -3605,7 +3605,7 @@ void K_DriftDustHandling(mobj_t *spawner)
if (spawner->player)
{
if (spawner->player->pflags & PF_SKIDDOWN)
if (spawner->player->pflags & PF_FAULT)
{
anglediff = abs((signed)(spawner->angle - spawner->player->frameangle));
if (leveltime % 6 == 0)
@ -5316,7 +5316,7 @@ void K_KartPlayerHUDUpdate(player_t *player)
if (player->karthud[khud_tauntvoices])
player->karthud[khud_tauntvoices]--;
if (!(player->pflags & PF_SKIDDOWN))
if (!(player->pflags & PF_FAULT))
player->karthud[khud_fault] = 0;
else if (player->karthud[khud_fault] > 0 && player->karthud[khud_fault] < 2*TICRATE)
player->karthud[khud_fault]++;

2
src/k_respawn.c
View file

@ -111,7 +111,7 @@ void K_DoIngameRespawn(player_t *player)
if (leveltime < starttime) // FAULT
{
player->powers[pw_nocontrol] = (starttime - leveltime) + 50;
player->pflags |= PF_SKIDDOWN|PF_FAULT; // cheeky pflag reuse
player->pflags |= PF_FAULT;
S_StartSound(player->mo, sfx_s3k83);
player->karthud[khud_fault] = 1;
}

4
src/p_user.c
View file

@ -5859,7 +5859,7 @@ static void P_MovePlayer(player_t *player)
else
player->frameangle -= (ANGLE_11hh * speed);
}
else if (player->powers[pw_nocontrol] && player->pflags & PF_SKIDDOWN)
else if (player->powers[pw_nocontrol] && player->pflags & PF_FAULT)
{
if (player->mo->state != &states[S_KART_SPIN])
P_SetPlayerMobjState(player->mo, S_KART_SPIN);
@ -9047,7 +9047,7 @@ void P_PlayerThink(player_t *player)
if (player->powers[pw_nocontrol] & ((1<<15)-1) && player->powers[pw_nocontrol] < UINT16_MAX)
{
if (!(--player->powers[pw_nocontrol]))
player->pflags &= ~PF_SKIDDOWN;
player->pflags &= ~PF_FAULT;
}
else
player->powers[pw_nocontrol] = 0;