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
2017-11-05 17:15:59 +01:00
parent 47a8bf668d a93b1a5b1a
commit a686e2ab29
5 changed files with 99 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulation.cpp
View File

@@ -812,7 +812,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch
Scratchpad.trainset.offset -= length;
// automatically establish permanent connections for couplers which specify them in their definitions
if( ( coupling != 0 )
&& ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? 0 : 1 ) ].AllowedFlag & coupling::permanent ) ) {
&& ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? side::front : side::rear ) ].AllowedFlag & coupling::permanent ) ) {
coupling |= coupling::permanent;
}
if( true == Scratchpad.trainset.is_open ) {