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

Merge branch 'tmj-dev' into lua

Browse Source
This commit is contained in:
milek7
2017-09-15 13:48:38 +02:00
parent 2de1de4999 6c69a5b8f1
commit 6c8290f66f
8 changed files with 179 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
World.cpp
View File

@@ -1052,6 +1052,7 @@ bool TWorld::Update()
Ground.CheckQuery();
Ground.Update_Hidden();
Ground.Update_Lights();
{
@@ -1452,6 +1453,10 @@ TWorld::Update_UI() {
+ ", Fr: " + to_string( tmp->MoverParameters->RunningTrack.friction, 2 )
+ ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" );
if( tmp->Mechanik ) {
uitextline2 += "; Ag: " + to_string( tmp->Mechanik->fAccGravity, 2 );
}
uitextline2 +=
"; TC:"
+ to_string( tmp->MoverParameters->TotalCurrent, 0 );