16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 22:39:18 +02:00

remove smooth brake control for levers other than FV4a

This commit is contained in:
milek7
2018-04-03 19:59:29 +02:00
parent 75b5ae6509
commit 5380666fa6
5 changed files with 17 additions and 23 deletions

View File

@@ -933,29 +933,19 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons
}
void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_REPEAT ) {
if( Train->mvOccupied->BrakeHandle == FV4a ) {
Train->mvOccupied->BrakeLevelAdd( Global.fBrakeStep * Command.time_delta );
}
else {
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos + Global.fBrakeStep * Command.time_delta );
}
}
if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == FV4a)
Train->mvOccupied->BrakeLevelAdd( Global.brake_speed * Command.time_delta );
else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != FV4a)
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos + Global.fBrakeStep );
}
void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ) {
if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == FV4a)
Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta );
else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != FV4a)
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep );
if( Command.action == GLFW_REPEAT ) {
// press or hold
if( Train->mvOccupied->BrakeHandle == FV4a ) {
Train->mvOccupied->BrakeLevelAdd( -Global.fBrakeStep * Command.time_delta );
}
else {
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep * Command.time_delta );
}
}
else if (Command.action == GLFW_RELEASE) {
if (Command.action == GLFW_RELEASE) {
// release
if( ( Train->mvOccupied->BrakeCtrlPos == -1 )
&& ( Train->mvOccupied->BrakeHandle == FVel6 )