eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-02-16 15:25:53 +01:00
parent 910b0b1dd6 2dd82bf71b
commit 61836eb2e4
113 changed files with 4617 additions and 4057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
motiontelemetry.cpp
View File

@@ -19,7 +19,7 @@
motiontelemetry::motiontelemetry()
{
conf = Global::motiontelemetry_conf;
conf = Global.motiontelemetry_conf;
#ifdef _WIN32
WSADATA wsd;
@@ -62,10 +62,10 @@ void motiontelemetry::update()
return;
last_update = now;
if (Global::iPause)
if (Global.iPause)
return;
TTrain *t = Global::pWorld->train();
TTrain *t = Global.pWorld->train();
if (!t)
return;