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

Merge commit '6b56fbddbeb231f28fd11c08c88dd4ef95db8f93' into milek-dev

Browse Source
This commit is contained in:
milek7
2019-03-16 21:08:25 +01:00
parent 4bc90cdd19 6b56fbddbe
commit 7daf38b169
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

@@ -2701,7 +2701,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();