pre-merge syncs

2026-07-22 17:29:18 +02:00 · 2018-02-03 17:37:46 +01:00
parent b3e7b88bbc
commit e8bb25454e
20 changed files with 53 additions and 82 deletions
--- a/Event.h
+++ b/Event.h
@@ -72,11 +72,7 @@ union TParam
    bool asBool;
    double asdouble;
    int asInt;
-#ifdef EU07_USE_OLD_SOUNDCODE
-    TTextSound *tsTextSound;
-#else
    sound_source *tsTextSound;
-#endif
    char *asText;
    TCommandType asCommand;
    TTractionPowerSource *psPower;