ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Fix #3168""

Browse Source 
This reverts commit 769d40e3c5.
This commit is contained in:
Deve 2018-12-15 23:57:37 +01:00
parent 24926bcb1d
commit 19c853949c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/karts/controller/local_player_controller.cpp
View File

@ -178,10 +178,22 @@ bool LocalPlayerController::action(PlayerAction action, int value,
} }
} }
// Check if skid key is pressed and if turn button is in disagreement
// with the current steering dominant, ignore the skid key press, see #3168
if (action == PA_DRIFT && value != 0)
{
if ((!PlayerController::action(PA_STEER_LEFT, 0, /*dry_run*/true) &&
m_controls->getSteer() < 0.0f) ||
(!PlayerController::action(PA_STEER_RIGHT, 0, /*dry_run*/true) &&
m_controls->getSteer() > 0.0f))
return false;
}
// If this event does not change the control state (e.g. // If this event does not change the control state (e.g.
// it's a (auto) repeat event), do nothing. This especially // it's a (auto) repeat event), do nothing. This especially
// optimises traffic to the server and other clients. // optimises traffic to the server and other clients.
if (!PlayerController::action(action, value, /*dry_run*/true)) return false; if (!PlayerController::action(action, value, /*dry_run*/true))
return false;
// Register event with history // Register event with history
if(!history->replayHistory()) if(!history->replayHistory())