stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-25 11:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add check to all of the friction stuff

Browse source
This commit is contained in:
fickleheart 2019-02-19 17:05:04 -06:00
parent 8988927d16
commit a59a1c53b0
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/k_kart.c
View file

@ -5440,43 +5440,46 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
} }
// Friction if (onground)
if (!player->kartstuff[k_offroad])
{ {
if (player->speed > 0 && cmd->forwardmove == 0 && player->mo->friction == 59392) // Friction
player->mo->friction += 4608; if (!player->kartstuff[k_offroad])
if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392) {
player->mo->friction += 1608; if (player->speed > 0 && cmd->forwardmove == 0 && player->mo->friction == 59392)
} player->mo->friction += 4608;
if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392)
player->mo->friction += 1608;
}
// Karma ice physics // Karma ice physics
if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
{ {
player->mo->friction += 1228; player->mo->friction += 1228;
if (player->mo->friction > FRACUNIT) if (player->mo->friction > FRACUNIT)
player->mo->friction = FRACUNIT; player->mo->friction = FRACUNIT;
if (player->mo->friction < 0) if (player->mo->friction < 0)
player->mo->friction = 0; player->mo->friction = 0;
player->mo->movefactor = FixedDiv(ORIG_FRICTION, player->mo->friction); player->mo->movefactor = FixedDiv(ORIG_FRICTION, player->mo->friction);
if (player->mo->movefactor < FRACUNIT) if (player->mo->movefactor < FRACUNIT)
player->mo->movefactor = 19*player->mo->movefactor - 18*FRACUNIT; player->mo->movefactor = 19*player->mo->movefactor - 18*FRACUNIT;
else else
player->mo->movefactor = FRACUNIT; //player->mo->movefactor = ((player->mo->friction - 0xDB34)*(0xA))/0x80; player->mo->movefactor = FRACUNIT; //player->mo->movefactor = ((player->mo->friction - 0xDB34)*(0xA))/0x80;
if (player->mo->movefactor < 32) if (player->mo->movefactor < 32)
player->mo->movefactor = 32; player->mo->movefactor = 32;
} }
// Wipeout slowdown // Wipeout slowdown
if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] && P_IsObjectOnGround(player->mo)) if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
{ {
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;
}
} }
K_KartDrift(player, onground); K_KartDrift(player, onground);