Merge remote-tracking branch 'tmj/master' into sim

Classes.h

@@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/.
 // Ra: zestaw klas do robienia wskaźników, aby uporządkować nagłówki
 //---------------------------------------------------------------------------
 class opengl_renderer;
+class opengl33_renderer;
 class TTrack; // odcinek trajektorii
 class basic_event;
 class TTrain; // pojazd sterowany
@@ -39,11 +40,18 @@ class memory_table;
 class powergridsource_table;
 class instance_table;
 class vehicle_table;
+class train_table;
 struct light_array;
 class particle_manager;
 struct dictionary_source;
 class trainset_desc;
 class scenery_desc;
+
+namespace plc {
+using element_handle = short;
+class basic_controller;
+}
+
 namespace scene {
 struct node_data;
 class basic_node;
@@ -70,7 +78,8 @@ enum class TCommandType
     cm_ChangeDirection,
     cm_PassengerStopPoint,
     cm_OutsideStation,
-    cm_Shunt,
+//    cm_Shunt, // unused?
+    cm_EmergencyBrake,
     cm_Command // komenda pobierana z komórki
 };