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

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-10-01 21:00:27 +02:00
47 changed files with 1674 additions and 972 deletions

View File

@@ -410,6 +410,7 @@ private:
sound_source sConverter { sound_placement::engine };
sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003
sound_source sSmallCompressor { sound_placement::engine };
sound_source sHeater { sound_placement::engine };
// braking sounds
sound_source dsbPneumaticRelay { sound_placement::external };
sound_source rsBrake { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab
@@ -547,6 +548,8 @@ private:
return iAxleFirst ?
Axle1.pPosition :
Axle0.pPosition; };
inline double Roll() {
return ( ( Axle1.GetRoll() + Axle0.GetRoll() ) ); }
/*
// TODO: check if scanning takes into account direction when selecting axle
// if it does, replace the version above