16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-09-01 20:59:18 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-11-02 11:54:07 +01:00
4 changed files with 14 additions and 5 deletions

View File

@@ -1289,7 +1289,7 @@ public:
/*! pomocniczy nastawnik:*/
bool IncScndCtrl(int CtrlSpeed);
bool DecScndCtrl(int CtrlSpeed);
int GetVirtualScndPos();
bool AddPulseForce(int Multipler);/*dla drezyny*/

View File

@@ -2064,6 +2064,16 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed)
return OK;
}
int TMoverParameters::GetVirtualScndPos()
{
if (TrainType == dt_ET42)
{
if (DynamicBrakeFlag && !ScndCtrlPos)
return -1;
}
return ScndCtrlPos;
}
// *************************************************************************************************
// Q: 20160710
// załączenie rozrządu