thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-22 10:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure it actually compiles

Browse source
This commit is contained in:
Sryder 2017-04-16 19:55:21 +01:00
parent 82a392079d
commit ba2cf198bf
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_kart.c
View file

@ -1054,11 +1054,6 @@ void K_MomentumToFacing(player_t *player)
{ {
angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
// Offroad is separate, it's difficult to factor it in with a variable value anyway.
if (!(player->kartstuff[k_startimer] || player->kartstuff[k_bootaketimer] || player->kartstuff[k_mushroomtimer])
&& player->kartstuff[k_offroad] >= 0 && speedonly)
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
if (dangle > ANGLE_180) if (dangle > ANGLE_180)
dangle = InvAngle(dangle); dangle = InvAngle(dangle);
@ -1074,8 +1069,14 @@ void K_MomentumToFacing(player_t *player)
// if speed is true it gets the speed boost power, otherwise it gets the acceleration // if speed is true it gets the speed boost power, otherwise it gets the acceleration
static fixed_t K_GetKartBoostPower(player_t *player, boolean speed) static fixed_t K_GetKartBoostPower(player_t *player, boolean speed)
{ {
fixed_t boostpower = FRACUNIT;
fixed_t boostvalue = 0; fixed_t boostvalue = 0;
// Offroad is separate, it's difficult to factor it in with a variable value anyway.
if (!(player->kartstuff[k_startimer] || player->kartstuff[k_bootaketimer] || player->kartstuff[k_mushroomtimer])
&& player->kartstuff[k_offroad] >= 0 && speed)
boostpower = FixedDiv(boostpower, player->kartstuff[k_offroad] + FRACUNIT);
if (player->kartstuff[k_growshrinktimer] > 1 if (player->kartstuff[k_growshrinktimer] > 1
&& (player->kartstuff[k_growshrinktimer] > (itemtime - 25) && (player->kartstuff[k_growshrinktimer] > (itemtime - 25)
|| player->kartstuff[k_growshrinktimer] <= 26)) || player->kartstuff[k_growshrinktimer] <= 26))
@ -1117,7 +1118,7 @@ static fixed_t K_GetKartBoostPower(player_t *player, boolean speed)
// don't average them anymore, this would make a small boost and a high boost less useful // don't average them anymore, this would make a small boost and a high boost less useful
// just take the highest we want instead // just take the highest we want instead
return FRACUNIT + boostvalue; return boostpower + boostvalue;
} }
fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower) fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)