eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 04:19:19 +02:00
Code Issues 121 Wiki Activity

Merge branch 'gfx-work' into sim

Browse Source
This commit is contained in:
milek7
2019-08-14 00:47:55 +02:00
parent bd850655a9 5abd822511
commit 4583cfcf1f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Train.cpp
View File

@@ -1043,10 +1043,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);
}
}
}
@@ -1063,13 +1064,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);
}
}
}