16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 21:29:18 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
126 changed files with 40430 additions and 6134 deletions

View File

@@ -5,6 +5,7 @@
#include "Train.h"
#include "Timer.h"
#include "Driver.h"
#include "simulation.h"
#ifdef _WIN32
#include <winsock2.h>
@@ -65,7 +66,7 @@ void motiontelemetry::update()
if (Global.iPause)
return;
const TTrain *t = Global.pWorld->train();
const TTrain *t = simulation::Train;
if (!t)
return;