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

Merge remote-tracking branch 'youby/master' into sim

Browse Source
This commit is contained in:
milek7
2022-02-17 23:29:57 +01:00
parent 9a0851cb2c da74c2ce28
commit 5624a6db1d
5 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
McZapkie/Mover.cpp
View File

@@ -6803,7 +6803,7 @@ bool TMoverParameters::AutoRelayCheck(void)
else
{ // zmieniaj mainctrlactualpos
if( ( DirActive < 0 ) && ( TrainType != dt_PseudoDiesel ) ) {
if( RList[ MainCtrlActualPos + 1 ].Bn > 1 ) {
if( RList[ MainCtrlActualPos + 1 ].Bn > BackwardsBranchesAllowed) {
return false; // nie poprawiamy przy konwersji
// return ARC;// bbylo exit; //Ra: to powoduje, że EN57 nie wyłącza się przy IminLo
}
@@ -10411,6 +10411,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
( ToLower( extract_value( "FSCircuit", line ) ) == "yes" ) ?
1 :
0;
extract_value( BackwardsBranchesAllowed, "BackwardsBranchesAllowed", line, "" );
extract_value( StopBrakeDecc, "SBD", line, "" );
extract_value( ReleaseParkingBySpringBrake, "ReleaseParkingBySpringBrake", line, "" );