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' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
parent e938466c90 e881092ca0
commit d9687a4e1f
126 changed files with 40430 additions and 6134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uart.cpp
View File

@@ -2,7 +2,7 @@
#include "uart.h"
#include "Globals.h"
#include "World.h"
#include "simulation.h"
#include "Train.h"
#include "parser.h"
#include "Logs.h"
@@ -130,7 +130,7 @@ void uart_input::poll()
return;
last_update = now;
auto *t = Global.pWorld->train();
auto const *t =simulation::Train;
if (!t)
return;