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

Rename PF_LOOKDOWN to PF_GAINAX

Browse source
This commit is contained in:
James R 2022-09-22 07:19:10 -07:00
parent 713c21688e
commit c792818887
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_player.h
View file

@ -62,7 +62,10 @@ typedef enum
PF_ATTACKDOWN = 1, PF_ATTACKDOWN = 1,
PF_ACCELDOWN = 1<<1, PF_ACCELDOWN = 1<<1,
PF_BRAKEDOWN = 1<<2, PF_BRAKEDOWN = 1<<2,
PF_LOOKDOWN = 1<<3,
// Look back VFX has been spawned
// TODO: Is there a better way to track this?
PF_GAINAX = 1<<3,
// Accessibility and cheats // Accessibility and cheats
PF_KICKSTARTACCEL = 1<<4, // Is accelerate in kickstart mode? PF_KICKSTARTACCEL = 1<<4, // Is accelerate in kickstart mode?

5
src/deh_tables.c
View file

@ -5729,7 +5729,10 @@ const char *const PLAYERFLAG_LIST[] = {
"ATTACKDOWN", "ATTACKDOWN",
"ACCELDOWN", "ACCELDOWN",
"BRAKEDOWN", "BRAKEDOWN",
"LOOKDOWN",
// Look back VFX has been spawned
// TODO: Is there a better way to track this?
"GAINAX",
// Accessibility and cheats // Accessibility and cheats
"KICKSTARTACCEL", // Is accelerate in kickstart mode? "KICKSTARTACCEL", // Is accelerate in kickstart mode?

10
src/k_kart.c
View file

@ -2489,7 +2489,7 @@ void K_KartMoveAnimation(player_t *player)
if (!lookback) if (!lookback)
{ {
player->pflags &= ~PF_LOOKDOWN; player->pflags &= ~PF_GAINAX;
// Uses turning over steering -- it's important to show player feedback immediately. // Uses turning over steering -- it's important to show player feedback immediately.
if (player->cmd.turning < -minturn) if (player->cmd.turning < -minturn)
@ -2513,7 +2513,7 @@ void K_KartMoveAnimation(player_t *player)
destGlanceDir = -(2*intsign(player->aizdriftturn)); destGlanceDir = -(2*intsign(player->aizdriftturn));
player->glanceDir = destGlanceDir; player->glanceDir = destGlanceDir;
drift = turndir = 0; drift = turndir = 0;
player->pflags &= ~PF_LOOKDOWN; player->pflags &= ~PF_GAINAX;
} }
else if (player->aizdriftturn) else if (player->aizdriftturn)
{ {
@ -2559,14 +2559,14 @@ void K_KartMoveAnimation(player_t *player)
gainaxstate = S_GAINAX_MID1; gainaxstate = S_GAINAX_MID1;
} }
if (destGlanceDir && !(player->pflags & PF_LOOKDOWN)) if (destGlanceDir && !(player->pflags & PF_GAINAX))
{ {
mobj_t *gainax = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_GAINAX); mobj_t *gainax = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_GAINAX);
gainax->movedir = (destGlanceDir < 0) ? (ANGLE_270-ANG10) : (ANGLE_90+ANG10); gainax->movedir = (destGlanceDir < 0) ? (ANGLE_270-ANG10) : (ANGLE_90+ANG10);
P_SetTarget(&gainax->target, player->mo); P_SetTarget(&gainax->target, player->mo);
P_SetMobjState(gainax, gainaxstate); P_SetMobjState(gainax, gainaxstate);
gainax->flags2 |= MF2_AMBUSH; gainax->flags2 |= MF2_AMBUSH;
player->pflags |= PF_LOOKDOWN; player->pflags |= PF_GAINAX;
} }
} }
else if (K_GetForwardMove(player) < 0 && destGlanceDir == 0) else if (K_GetForwardMove(player) < 0 && destGlanceDir == 0)
@ -2823,7 +2823,7 @@ void K_KartMoveAnimation(player_t *player)
} }
if (!player->glanceDir) if (!player->glanceDir)
player->pflags &= ~PF_LOOKDOWN; player->pflags &= ~PF_GAINAX;
// Update lastspeed value -- we use to display slow driving frames instead of fast driving when slowing down. // Update lastspeed value -- we use to display slow driving frames instead of fast driving when slowing down.
player->lastspeed = player->speed; player->lastspeed = player->speed;

2
src/p_inter.c
View file

@ -2062,7 +2062,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
player->driftboost = player->strongdriftboost = 0; player->driftboost = player->strongdriftboost = 0;
player->ringboost = 0; player->ringboost = 0;
player->glanceDir = 0; player->glanceDir = 0;
player->pflags &= ~PF_LOOKDOWN; player->pflags &= ~PF_GAINAX;
switch (type) switch (type)
{ {

4
src/p_user.c
View file

@ -2218,7 +2218,7 @@ void P_MovePlayer(player_t *player)
player->drawangle -= ANGLE_22h; player->drawangle -= ANGLE_22h;
player->mo->rollangle = 0; player->mo->rollangle = 0;
player->glanceDir = 0; player->glanceDir = 0;
player->pflags &= ~PF_LOOKDOWN; player->pflags &= ~PF_GAINAX;
} }
else if ((player->pflags & PF_FAULT) || (player->spinouttimer > 0)) else if ((player->pflags & PF_FAULT) || (player->spinouttimer > 0))
{ {
@ -4405,8 +4405,6 @@ void P_PlayerThink(player_t *player)
else else
player->pflags &= ~PF_BRAKEDOWN; player->pflags &= ~PF_BRAKEDOWN;
// PF_LOOKDOWN handled in K_KartMoveAnimation
// Counters, time dependent power ups. // Counters, time dependent power ups.
// Time Bonus & Ring Bonus count settings // Time Bonus & Ring Bonus count settings