Merge branch 'tmj-dev'

DynObj.h

@@ -12,8 +12,10 @@ http://mozilla.org/MPL/2.0/.
 #include <string>
 #include <functional>
 
+#include "Classes.h"
+#include "material.h"
+#include "MOVER.h"
 #include "TrkFoll.h"
-// McZapkie:
 #include "Button.h"
 #include "AirCoupler.h"
 #include "Texture.h"
@@ -268,6 +270,7 @@ private:
     };
 
     struct pantograph_sounds {
+        // TODO: split pantograph sound into one for contact of arm with the wire, and electric arc sound
         sound_source sPantUp { sound_placement::external };
         sound_source sPantDown { sound_placement::external };
     };
@@ -453,7 +456,8 @@ private:
 
     TDynamicObject();
     ~TDynamicObject();
-    double Init( // zwraca długość pojazdu albo 0, jeśli błąd
+    // zwraca długość pojazdu albo 0, jeśli błąd
+    double Init(
         std::string Name, std::string BaseDir, std::string asReplacableSkin, std::string Type_Name,
         TTrack *Track, double fDist, std::string DriverType, double fVel, std::string TrainName,
         float Load, std::string LoadType, bool Reversed, std::string);