diff --git a/src/d_player.h b/src/d_player.h index ad7b75b86..d817c4231 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -62,7 +62,10 @@ typedef enum PF_ATTACKDOWN = 1, PF_ACCELDOWN = 1<<1, 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 PF_KICKSTARTACCEL = 1<<4, // Is accelerate in kickstart mode? diff --git a/src/deh_tables.c b/src/deh_tables.c index 7f293daa3..2cc9cdb09 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -5729,7 +5729,10 @@ const char *const PLAYERFLAG_LIST[] = { "ATTACKDOWN", "ACCELDOWN", "BRAKEDOWN", - "LOOKDOWN", + + // Look back VFX has been spawned + // TODO: Is there a better way to track this? + "GAINAX", // Accessibility and cheats "KICKSTARTACCEL", // Is accelerate in kickstart mode? diff --git a/src/k_kart.c b/src/k_kart.c index 8fc6a0ab1..088eb834b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2489,7 +2489,7 @@ void K_KartMoveAnimation(player_t *player) if (!lookback) { - player->pflags &= ~PF_LOOKDOWN; + player->pflags &= ~PF_GAINAX; // Uses turning over steering -- it's important to show player feedback immediately. if (player->cmd.turning < -minturn) @@ -2513,7 +2513,7 @@ void K_KartMoveAnimation(player_t *player) destGlanceDir = -(2*intsign(player->aizdriftturn)); player->glanceDir = destGlanceDir; drift = turndir = 0; - player->pflags &= ~PF_LOOKDOWN; + player->pflags &= ~PF_GAINAX; } else if (player->aizdriftturn) { @@ -2559,14 +2559,14 @@ void K_KartMoveAnimation(player_t *player) 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); gainax->movedir = (destGlanceDir < 0) ? (ANGLE_270-ANG10) : (ANGLE_90+ANG10); P_SetTarget(&gainax->target, player->mo); P_SetMobjState(gainax, gainaxstate); gainax->flags2 |= MF2_AMBUSH; - player->pflags |= PF_LOOKDOWN; + player->pflags |= PF_GAINAX; } } else if (K_GetForwardMove(player) < 0 && destGlanceDir == 0) @@ -2823,7 +2823,7 @@ void K_KartMoveAnimation(player_t *player) } 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. player->lastspeed = player->speed; diff --git a/src/p_inter.c b/src/p_inter.c index d21fb1195..4b2b8381a 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2062,7 +2062,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da player->driftboost = player->strongdriftboost = 0; player->ringboost = 0; player->glanceDir = 0; - player->pflags &= ~PF_LOOKDOWN; + player->pflags &= ~PF_GAINAX; switch (type) { diff --git a/src/p_user.c b/src/p_user.c index f733bad28..22a1d38ba 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2218,7 +2218,7 @@ void P_MovePlayer(player_t *player) player->drawangle -= ANGLE_22h; player->mo->rollangle = 0; player->glanceDir = 0; - player->pflags &= ~PF_LOOKDOWN; + player->pflags &= ~PF_GAINAX; } else if ((player->pflags & PF_FAULT) || (player->spinouttimer > 0)) { @@ -4405,8 +4405,6 @@ void P_PlayerThink(player_t *player) else player->pflags &= ~PF_BRAKEDOWN; - // PF_LOOKDOWN handled in K_KartMoveAnimation - // Counters, time dependent power ups. // Time Bonus & Ring Bonus count settings