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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-12-09 21:54:28 +01:00
parent c0d824a6bd f31c7972ab
commit a47f0b7f94
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Train.cpp
View File

@@ -750,6 +750,11 @@ void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data con
if( Command.action != GLFW_RELEASE ) { if( Command.action != GLFW_RELEASE ) {
// on press or hold // on press or hold
Train->mvControlled->IncMainCtrl( 1 ); Train->mvControlled->IncMainCtrl( 1 );
Train->m_mastercontrollerinuse = true;
}
else if (Command.action == GLFW_RELEASE) {
// release
Train->m_mastercontrollerinuse = false;
} }
} }
@@ -768,7 +773,7 @@ void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data con
Train->mvControlled->DecMainCtrl( 1 ); Train->mvControlled->DecMainCtrl( 1 );
Train->m_mastercontrollerinuse = true; Train->m_mastercontrollerinuse = true;
} }
else { else if (Command.action == GLFW_RELEASE) {
// release // release
Train->m_mastercontrollerinuse = false; Train->m_mastercontrollerinuse = false;
} }
@@ -808,11 +813,6 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con
else { else {
Train->mvControlled->IncScndCtrl( 1 ); Train->mvControlled->IncScndCtrl( 1 );
} }
Train->m_mastercontrollerinuse = true;
}
else {
// release
Train->m_mastercontrollerinuse = false;
} }
} }
@@ -1031,18 +1031,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co
Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta * Train->mvOccupied->BrakeCtrlPosNo ); Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta * Train->mvOccupied->BrakeCtrlPosNo );
else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a) else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a)
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep ); Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep );
else if (Command.action == GLFW_RELEASE) {
if (Command.action == GLFW_RELEASE) {
// release
if( ( Train->mvOccupied->BrakeCtrlPos == -1 )
&& ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 )
&& ( Train->DynamicObject->Controller != AIdriver )
&& ( Global.iFeedbackMode < 3 ) ) {
// Odskakiwanie hamulce EP
Train->set_train_brake( 0 );
}
}
else {
// release // release
if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) if( ( Train->mvOccupied->BrakeCtrlPos == -1 )
&& ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 ) && ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 )