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

Merge branch 'gfx-work' into sim

Browse Source
This commit is contained in:
milek7
2019-03-16 21:09:26 +01:00
parent 16570f8d23 8d67f3f94c
commit debf0f6eff
6 changed files with 208 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DynObj.cpp
View File

@@ -2687,7 +2687,10 @@ bool TDynamicObject::Update(double dt, double dt1)
auto osie { 0 };
// 0a. ustal aktualna nastawe zadania sily napedowej i hamowania
if (MoverParameters->Power < 1)
{
MoverParameters->MainCtrlPos = ctOwner->Controlling()->MainCtrlPos*MoverParameters->MainCtrlPosNo / std::max(1, ctOwner->Controlling()->MainCtrlPosNo);
MoverParameters->ScndCtrlActualPos = ctOwner->Controlling()->ScndCtrlActualPos;
}
MoverParameters->CheckEIMIC(dt1);
MoverParameters->CheckSpeedCtrl();