From e3ad89e67414e1e7a972fdf14c57063e47b6e006 Mon Sep 17 00:00:00 2001
From: Ramen2X <rmn@legoisland.org>
Date: Tue, 19 Mar 2024 15:18:48 -0400
Subject: [PATCH] remove existing fwd declares

---
 LEGO1/lego/legoomni/include/isle.h            | 19 +------------------
 .../legoomni/include/legoanimationmanager.h   | 10 +---------
 LEGO1/lego/legoomni/include/misc.h            | 10 +---------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 7ded407f..0439d0a1 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -1,6 +1,7 @@
 #ifndef ISLE_H
 #define ISLE_H
 
+#include "actionsfwd.h"
 #include "legogamestate.h"
 #include "legoworld.h"
 #include "radio.h"
@@ -19,24 +20,6 @@ class RaceCar;
 class Jetski;
 class Act1State;
 
-namespace IsleScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace IsleScript
-
-namespace JukeboxScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace JukeboxScript
-
 // VTABLE: LEGO1 0x100d6fb8
 // SIZE 0x140
 class Isle : public LegoWorld {
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index e46e1f72..e235af40 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -1,6 +1,7 @@
 #ifndef LEGOANIMATIONMANAGER_H
 #define LEGOANIMATIONMANAGER_H
 
+#include "actionsfwd.h"
 #include "animstate.h"
 #include "decomp.h"
 #include "legotraninfolist.h"
@@ -13,15 +14,6 @@ struct Character {
 	MxBool m_active;           // 0x14
 };
 
-namespace IsleScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace IsleScript
-
 // VTABLE: LEGO1 0x100d8c18
 // SIZE 0x500
 class LegoAnimationManager : public MxCore {
diff --git a/LEGO1/lego/legoomni/include/misc.h b/LEGO1/lego/legoomni/include/misc.h
index 98d4b352..433d2c2e 100644
--- a/LEGO1/lego/legoomni/include/misc.h
+++ b/LEGO1/lego/legoomni/include/misc.h
@@ -1,6 +1,7 @@
 #ifndef MISC_H
 #define MISC_H
 
+#include "actionsfwd.h"
 #include "compat.h"
 #include "decomp.h"
 #include "mxtypes.h"
@@ -27,15 +28,6 @@ class MxTransitionManager;
 class ViewLODListManager;
 class ViewManager;
 
-namespace JukeboxScript
-{
-#ifdef COMPAT_MODE
-enum Script : int;
-#else
-enum Script;
-#endif
-} // namespace JukeboxScript
-
 extern MxBool g_isWorldActive;
 
 LegoOmni* Lego();