eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

configurable pantograph compressor valve type, power coupler state calculation fixes, vehicle heating system enhancements, fiz file parser enhancement, debug ui panel enhancements, delayed door closing cab switch type

Browse Source
This commit is contained in:
tmj-fstate
2019-06-13 01:38:20 +02:00
parent 32ca2b76ff
commit 85d810b330
10 changed files with 152 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Train.cpp
View File

@@ -4721,8 +4721,11 @@ void TTrain::OnCommand_doorcloseall( TTrain *Train, command_data const &Command
if( Train->mvOccupied->Doors.has_autowarning ) {
Train->mvOccupied->signal_departure( true );
}
Train->mvOccupied->OperateDoors( side::right, false );
Train->mvOccupied->OperateDoors( side::left, false );
if( Train->ggDoorAllOffButton.type() != TGaugeType::push_delayed ) {
// delays the action until the button is released
Train->mvOccupied->OperateDoors( side::right, false );
Train->mvOccupied->OperateDoors( side::left, false );
}
// visual feedback
Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch );
Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch );
@@ -4730,10 +4733,14 @@ void TTrain::OnCommand_doorcloseall( TTrain *Train, command_data const &Command
Train->ggDoorAllOffButton.UpdateValue( 1.0, Train->dsbSwitch );
}
else if( Command.action == GLFW_RELEASE ) {
// release the button
if( Train->mvOccupied->Doors.has_autowarning ) {
Train->mvOccupied->signal_departure( false );
}
if( Train->ggDoorAllOffButton.type() == TGaugeType::push_delayed ) {
// now we can actually close the door
Train->mvOccupied->OperateDoors( side::right, false );
Train->mvOccupied->OperateDoors( side::left, false );
}
// visual feedback
if( Train->ggDoorAllOffButton.SubModel )
Train->ggDoorAllOffButton.UpdateValue( 0.0 );