Fix speedometer in outrun mode

This commit is contained in:
Sally Coolatta 2023-06-15 12:12:41 -04:00
parent 6d1a3de243
commit a8467a22ce

View file

@ -3301,6 +3301,7 @@ fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed)
fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower, boolean dorubberband) fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower, boolean dorubberband)
{ {
const boolean mobjValid = (player->mo != NULL && P_MobjWasRemoved(player->mo) == false); const boolean mobjValid = (player->mo != NULL && P_MobjWasRemoved(player->mo) == false);
const fixed_t physicsScale = mobjValid ? K_GrowShrinkSpeedMul(player) : FRACUNIT;
fixed_t finalspeed = 0; fixed_t finalspeed = 0;
if (K_PodiumSequence() == true) if (K_PodiumSequence() == true)
@ -3344,19 +3345,17 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower, boolean dorubberb
if (doboostpower == true) if (doboostpower == true)
{ {
if (mobjValid == true) // Scale with the player.
{ finalspeed = FixedMul(finalspeed, physicsScale);
// Scale with the player.
finalspeed = FixedMul(finalspeed, K_GrowShrinkSpeedMul(player));
}
// Add speed boosts.
finalspeed = FixedMul(finalspeed, player->boostpower + player->speedboost); finalspeed = FixedMul(finalspeed, player->boostpower + player->speedboost);
}
if (mobjValid == true && player->outrun != 0) if (player->outrun != 0)
{ {
// Milky Way's roads // Milky Way's roads
finalspeed += FixedMul(player->outrun, K_GrowShrinkSpeedMul(player)); finalspeed += FixedMul(player->outrun, physicsScale);
}
} }
return finalspeed; return finalspeed;