From 7185904e3824043e28863dad9a54e5c2efd26841 Mon Sep 17 00:00:00 2001 From: milek7 Date: Wed, 14 Aug 2019 00:45:50 +0200 Subject: [PATCH] disable continuous brake for jointctrls --- Train.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Train.cpp b/Train.cpp index 42b62bf7..a4d5899a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1039,10 +1039,11 @@ void TTrain::OnCommand_secondcontrollerset( TTrain *Train, command_data const &C void TTrain::OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_REPEAT ) { - - if( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) { - Train->mvOccupied->IncLocalBrakeLevel( Global.brake_speed * Command.time_delta * LocalBrakePosNo ); + if( Command.action != GLFW_RELEASE ) { + if( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) { + Train->mvOccupied->IncLocalBrakeLevel( + (Train->ggJointCtrl.SubModel == nullptr) ? + (Global.brake_speed * Command.time_delta * LocalBrakePosNo) : 1); } } } @@ -1059,13 +1060,15 @@ void TTrain::OnCommand_independentbrakeincreasefast( TTrain *Train, command_data void TTrain::OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_REPEAT ) { + if( Command.action != GLFW_RELEASE ) { if( ( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba // TODO: sort AI out so it doesn't do things it doesn't have equipment for || ( Train->mvOccupied->LocalBrakePosA > 0 ) ) { - Train->mvOccupied->DecLocalBrakeLevel( Global.brake_speed * Command.time_delta * LocalBrakePosNo ); + Train->mvOccupied->DecLocalBrakeLevel( + (Train->ggJointCtrl.SubModel == nullptr) ? + (Global.brake_speed * Command.time_delta * LocalBrakePosNo) : 1); } } }