diff --git a/src/d_player.h b/src/d_player.h index 09f946a9..e4fd82d0 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -256,7 +256,6 @@ typedef enum k_driftangle, // Stores player turn angle for drifting k_driftcharge, // Charge your drift so you can release a burst of speed k_driftboost, // Boost you get from drifting - k_driftfix, // Used to fix your angle after releasing drift. k_boostcharge, // Charge-up for boosting at the start of the race, or when Lakitu drops you k_jmp, // In Mario Kart, letting go of the jump button stops the drift k_lakitu, // > 0 = Lakitu fishing, < 0 = Lakitu lap counter (was "player->airtime") // NOTE: Check for ->lakitu, replace with this diff --git a/src/g_game.c b/src/g_game.c index 77b51a74..6de503c0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1147,6 +1147,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics) } */ + /* if (PLAYER1INPUTDOWN(gc_lookback)) { if (camera.chase && !player->kartstuff[k_camspin]) @@ -1154,6 +1155,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics) } else if (player->kartstuff[k_camspin] > 0) player->kartstuff[k_camspin] = -1; + */ // jump button if (PLAYER1INPUTDOWN(gc_jump)) diff --git a/src/k_kart.c b/src/k_kart.c index 7702c0d6..4a34d839 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1780,19 +1780,6 @@ fixed_t K_GetKartTurnValue(player_t *player, ticcmd_t *cmd) player->kartstuff[k_driftangle] = p_angle; - if (!player->kartstuff[k_drift] && player->kartstuff[k_driftfix] > 0) - { - if (P_IsObjectOnGround(player->mo)) - p_angle += FixedMul(800, adjustangle); - player->kartstuff[k_driftfix]--; - } - else if (!player->kartstuff[k_drift] && player->kartstuff[k_driftfix] < 0) - { - if (P_IsObjectOnGround(player->mo)) - p_angle -= FixedMul(800, adjustangle); - player->kartstuff[k_driftfix]++; - } - return p_angle; } diff --git a/src/p_user.c b/src/p_user.c index a5417478..abd38e50 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -4591,12 +4591,10 @@ static void P_3dMovement(player_t *player) if (player->kartstuff[k_drift] >= 1) { movepushangle = player->mo->angle+ANGLE_45; - player->kartstuff[k_driftfix] = 5; } else if (player->kartstuff[k_drift] <= -1) { movepushangle = player->mo->angle-ANGLE_45; - player->kartstuff[k_driftfix] = -5; } else movepushangle = player->mo->angle;