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

Merge branch 'tmj-dev' into nogfx

Browse Source
This commit is contained in:
milek7
2017-08-24 23:30:41 +02:00
parent d3b8a40f2c 42aab52038
commit 73a1baf3f9
15 changed files with 284 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
World.cpp
View File

@@ -1711,7 +1711,7 @@ TWorld::Update_UI() {
+ ")";
uitextline2 =
"HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 1 )
"HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 2 )
+ "; HamP=" + std::to_string( tmp->MoverParameters->LocalBrakePos ) + "/" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 )
+ "; NasJ=" + std::to_string( tmp->MoverParameters->MainCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->MainCtrlActualPos ) + ")"
+ "; NasB=" + std::to_string( tmp->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->ScndCtrlActualPos ) + ")"