Merge branch 'tmj-dev' into dev

2026-07-22 05:49:19 +02:00 · 2017-12-25 18:27:10 +01:00
parent 0aaeda576e 1b5e6aafd1
commit a215a0f8b3
65 changed files with 5288 additions and 4558 deletions
--- a/Event.h
+++ b/Event.h
@@ -75,7 +75,7 @@ union TParam
    bool asBool;
    double asdouble;
    int asInt;
-    sound *tsTextSound;
+    sound_source *tsTextSound;
    char *asText;
    TCommandType asCommand;
    TTractionPowerSource *psPower;