stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-12 04:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'spinout-changes' of git.magicalgirl.moe:KartKrew/Kart-Public into spinout-changes

Browse source
This commit is contained in:
Latapostrophe 2020-05-20 10:13:36 +02:00
commit e8870dee24
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_kart.c
View file

@ -5812,14 +5812,19 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->mo->movefactor = 32; player->mo->movefactor = 32;
} }
// Wipeout slowdown // Wipeout slowdown and banana slowdown in offroad (make sure this doesn't apply if we're boosting, however.)
if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow]) if ((player->kartstuff[k_spinouttimer] || player->kartstuff[k_wipeoutslow]) && !player->kartstuff[k_sneakertimer])
{ {
if (player->kartstuff[k_offroad]) if (player->kartstuff[k_offroad])
player->mo->friction -= 4912; player->mo->friction -= 4912;
if (player->kartstuff[k_wipeoutslow] == 1) if (player->kartstuff[k_wipeoutslow] == 1)
player->mo->friction -= 9824; player->mo->friction -= 9824;
} }
// Band-aid to make sure we never get any weird shit (tm) happening on us.
if (player->mo->friction < 0)
player->mo->friction = 0;
} }
K_KartDrift(player, onground); K_KartDrift(player, onground);

3
src/p_mobj.c
View file

@ -1908,7 +1908,8 @@ void P_XYMovement(mobj_t *mo)
if (mo->type == MT_ORBINAUT || mo->type == MT_JAWZ_DUD || mo->type == MT_JAWZ || mo->type == MT_BALLHOG) //(mo->type == MT_JAWZ && !mo->tracer)) if (mo->type == MT_ORBINAUT || mo->type == MT_JAWZ_DUD || mo->type == MT_JAWZ || mo->type == MT_BALLHOG) //(mo->type == MT_JAWZ && !mo->tracer))
return; return;
if (mo->player && (mo->player->kartstuff[k_spinouttimer] && !mo->player->kartstuff[k_wipeoutslow]) && mo->player->speed <= K_GetKartSpeed(mo->player, false)/2) // hey maybe we should check for offroad as well before ignoring literally all friction ever
if (mo->player && (mo->player->kartstuff[k_spinouttimer] && !mo->player->kartstuff[k_offroad] && !mo->player->kartstuff[k_wipeoutslow]) && mo->player->speed <= K_GetKartSpeed(mo->player, false)/4)
return; return;
//} //}