Implement/match Isle::HandleTransitionEnd (#683)

* Implement/match Isle::HandleTransitionEnd * Rename enums * Forward declare enum for C++11+ * Add underlying storage to action headers * Fix missing define
2025-10-26 18:04:06 +00:00 · 2024-03-17 13:01:47 -04:00
parent 4197e3c326
commit 5b8f515968
66 changed files with 494 additions and 81 deletions
--- a/LEGO1/lego/legoomni/include/actions/act2main_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/act2main_actions.h
@@ -5,7 +5,11 @@

 namespace Act2mainScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneAct2main = -1,

 	c__Act2Main = 0,
--- a/LEGO1/lego/legoomni/include/actions/act3_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/act3_actions.h
@@ -5,7 +5,11 @@

 namespace Act3Script
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneAct3 = -1,

 	c__Act3 = 0,
--- a/LEGO1/lego/legoomni/include/actions/carrace_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/carrace_actions.h
@@ -5,7 +5,11 @@

 namespace CarraceScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneCarrace = -1,

 	c__CarRace_World = 0,
--- a/LEGO1/lego/legoomni/include/actions/carracer_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/carracer_actions.h
@@ -5,7 +5,11 @@

 namespace CarracerScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneCarracer = -1,

 	c_nrt002pz_Anim = 0,
--- a/LEGO1/lego/legoomni/include/actions/copter_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/copter_actions.h
@@ -5,7 +5,11 @@

 namespace CopterScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneCopter = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/credits_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/credits_actions.h
@@ -5,7 +5,11 @@

 namespace CreditsScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneCredits = -1,

 	c_Credits_Wav = 0,
--- a/LEGO1/lego/legoomni/include/actions/dunecar_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/dunecar_actions.h
@@ -5,7 +5,11 @@

 namespace DunecarScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneDunecar = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/elevbott_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/elevbott_actions.h
@@ -5,7 +5,11 @@

 namespace ElevbottScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneElevbott = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/garage_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/garage_actions.h
@@ -5,7 +5,11 @@

 namespace GarageScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneGarage = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/histbook_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/histbook_actions.h
@@ -5,7 +5,11 @@

 namespace HistbookScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneHistbook = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/hospital_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/hospital_actions.h
@@ -5,7 +5,11 @@

 namespace HospitalScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneHospital = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/infodoor_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infodoor_actions.h
@@ -5,7 +5,11 @@

 namespace InfodoorScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneInfodoor = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/infomain_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infomain_actions.h
@@ -5,7 +5,11 @@

 namespace InfomainScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneInfomain = -1,

 	c__InfoMain = 0,
--- a/LEGO1/lego/legoomni/include/actions/infoscor_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/infoscor_actions.h
@@ -5,7 +5,11 @@

 namespace InfoscorScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneInfoscor = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/intro_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/intro_actions.h
@@ -5,7 +5,11 @@

 namespace IntroScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneIntro = -1,

 	c_Lego_Movie = 0,
--- a/LEGO1/lego/legoomni/include/actions/isle_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/isle_actions.h
@@ -5,7 +5,11 @@

 namespace IsleScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneIsle = -1,

 	c__Isle = 0,
@@ -2435,6 +2439,12 @@ enum Script {
 	c_hho141cl_Pho_684 = 2427,
 	c_hho142cl_0_sfx = 2428,
 	c_hho142cl_1_sfx = 2429,
+};
+#ifdef COMPAT_MODE
+enum Script2 : int {
+#else
+enum Script2 {
+#endif
 	c_hho142cl_2_sfx = 2430,
 	c_hho142cl_3_sfx = 2431,
 	c_hho142cl_4_sfx = 2432,
@@ -3671,7 +3681,7 @@ enum Script {
 	c_srt004in_Anim = 3663,
 	c_IRTX08RA_Wav_868 = 3664,
 	c_nrtflag0_Anim = 3665,
-	c_WNS050P1_Wav = 3666,
+	c_WNS050P1_Wav_X = 3666,
 	c_wns050p1_0_sfx = 3667,
 	c_wns050p1_1_sfx = 3668,
 	c_wns050p1_Anim = 3669,
--- a/LEGO1/lego/legoomni/include/actions/jetrace_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetrace_actions.h
@@ -5,7 +5,11 @@

 namespace JetraceScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneJetrace = -1,

 	c__JetRace_World = 0,
--- a/LEGO1/lego/legoomni/include/actions/jetracer_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetracer_actions.h
@@ -5,7 +5,11 @@

 namespace JetracerScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneJetracer = -1,

 	c_Trigger200_Drown = 200,
--- a/LEGO1/lego/legoomni/include/actions/jetski_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jetski_actions.h
@@ -5,7 +5,11 @@

 namespace JetskiScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneJetski = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/jukebox_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jukebox_actions.h
@@ -5,7 +5,11 @@

 namespace JukeboxScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneJukebox = -1,

 	c_MusicTheme1 = 0,
--- a/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h
@@ -5,7 +5,11 @@

 namespace JukeboxwScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneJukeboxw = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/nocd_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/nocd_actions.h
@@ -5,7 +5,11 @@

 namespace NocdScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneNocd = -1,

 	c_NoCD_Movie = 0,
--- a/LEGO1/lego/legoomni/include/actions/police_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/police_actions.h
@@ -5,7 +5,11 @@

 namespace PoliceScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_nonePolice = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/racecar_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/racecar_actions.h
@@ -5,7 +5,11 @@

 namespace RacecarScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneRacecar = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/regbook_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/regbook_actions.h
@@ -5,7 +5,11 @@

 namespace RegbookScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneRegbook = -1,

 	c__StartUp = 0,
--- a/LEGO1/lego/legoomni/include/actions/sndanim_actions.h
+++ b/LEGO1/lego/legoomni/include/actions/sndanim_actions.h
@@ -5,7 +5,11 @@

 namespace SndanimScript
 {
+#ifdef COMPAT_MODE
+enum Script : int {
+#else
 enum Script {
+#endif
 	c_noneSndanim = -1,

 	c_SoundAndAnim_Action = 0,