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

Merge branch 'gfx-work' into sim

Browse Source
This commit is contained in:
milek7
2019-09-15 21:48:26 +02:00
parent 8bb65f006d 18f7d1efbe
commit 2dd7fb8e8f
19 changed files with 509 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulationstateserializer.cpp
View File

@@ -685,7 +685,7 @@ state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data &
for( auto *vehicle : Scratchpad.trainset.vehicles ) {
// go through list of vehicles in the trainset, coupling them together and checking for potential driver
if( ( vehicle->Mechanik != nullptr )
&& ( vehicle->Mechanik->Primary() ) ) {
&& ( vehicle->Mechanik->primary() ) ) {
// primary driver will receive the timetable for this trainset
Scratchpad.trainset.driver = vehicle;
// they'll also receive assignment data if there's any