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

Update how scaled speed is calculated

Browse source 
This makes it so that the scaled speed shows up on the percentage speedometer.
This commit is contained in:
Sally Coolatta 2022-01-09 00:10:14 -05:00
parent 23f9649fb9
commit 1ad82e7651
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/k_kart.c
View file

@ -2906,22 +2906,20 @@ static void K_GetKartBoostPower(player_t *player)
fixed_t K_GrowShrinkSpeedMul(player_t *player) fixed_t K_GrowShrinkSpeedMul(player_t *player)
{ {
fixed_t scaleDiff = player->mo->scale - mapobjectscale; fixed_t scaleDiff = player->mo->scale - mapobjectscale;
fixed_t physicsScale = mapobjectscale; fixed_t playerScale = FixedDiv(player->mo->scale, mapobjectscale);
fixed_t speedMul = FRACUNIT; fixed_t speedMul = FRACUNIT;
if (scaleDiff > 0) if (scaleDiff > 0)
{ {
// Grown // Grown
// Change x2 speed into x1.5 // Change x2 speed into x1.5
physicsScale = FixedMul(GROW_PHYSICS_SCALE, mapobjectscale); speedMul = FixedDiv(FixedMul(playerScale, GROW_PHYSICS_SCALE), GROW_SCALE);
speedMul = FixedDiv(physicsScale, player->mo->scale);
} }
else if (scaleDiff < 0) else if (scaleDiff < 0)
{ {
// Shrunk // Shrunk
// Change x0.5 speed into x0.75 // Change x0.5 speed into x0.75
physicsScale = FixedMul(SHRINK_PHYSICS_SCALE, mapobjectscale); speedMul = FixedDiv(FixedMul(playerScale, SHRINK_PHYSICS_SCALE), SHRINK_SCALE);
speedMul = FixedDiv(physicsScale, player->mo->scale);
} }
return speedMul; return speedMul;
@ -2965,18 +2963,16 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
} }
} }
if (mobjValid == true) finalspeed = FixedMul(finalspeed, mapobjectscale);
{
finalspeed = FixedMul(finalspeed, player->mo->scale);
finalspeed = FixedMul(finalspeed, K_GrowShrinkSpeedMul(player));
}
else
{
finalspeed = FixedMul(finalspeed, mapobjectscale);
}
if (doboostpower == true) if (doboostpower == true)
{ {
if (mobjValid == true)
{
// Scale with the player.
finalspeed = FixedMul(finalspeed, K_GrowShrinkSpeedMul(player));
}
if (K_PlayerUsesBotMovement(player)) if (K_PlayerUsesBotMovement(player))
{ {
finalspeed = FixedMul(finalspeed, K_BotTopSpeedRubberband(player)); finalspeed = FixedMul(finalspeed, K_BotTopSpeedRubberband(player));