From 2477b89e329aed4c4c56d725e0bd116d40d787f4 Mon Sep 17 00:00:00 2001 From: Ramen2X Date: Tue, 19 Mar 2024 15:54:13 -0400 Subject: [PATCH] add actions forward decl header (#699) * add actions forward decl header * newline * format * remove existing fwd declares * Headers * replace COMPAT_MODE check * flip --------- Co-authored-by: Christian Semmler --- .../include/actions/act2main_actions.h | 2 +- .../legoomni/include/actions/act3_actions.h | 2 +- .../legoomni/include/actions/actionsfwd.h | 246 ++++++++++++++++++ .../include/actions/carrace_actions.h | 2 +- .../include/actions/carracer_actions.h | 2 +- .../legoomni/include/actions/copter_actions.h | 2 +- .../include/actions/credits_actions.h | 2 +- .../include/actions/dunecar_actions.h | 2 +- .../include/actions/elevbott_actions.h | 2 +- .../legoomni/include/actions/garage_actions.h | 2 +- .../include/actions/histbook_actions.h | 2 +- .../include/actions/hospital_actions.h | 2 +- .../include/actions/infodoor_actions.h | 2 +- .../include/actions/infomain_actions.h | 2 +- .../include/actions/infoscor_actions.h | 2 +- .../legoomni/include/actions/intro_actions.h | 2 +- .../legoomni/include/actions/isle_actions.h | 4 +- .../include/actions/jetrace_actions.h | 2 +- .../include/actions/jetracer_actions.h | 2 +- .../legoomni/include/actions/jetski_actions.h | 2 +- .../include/actions/jukebox_actions.h | 2 +- .../include/actions/jukeboxw_actions.h | 2 +- .../legoomni/include/actions/nocd_actions.h | 2 +- .../legoomni/include/actions/police_actions.h | 2 +- .../include/actions/racecar_actions.h | 2 +- .../include/actions/regbook_actions.h | 2 +- .../include/actions/sndanim_actions.h | 2 +- LEGO1/lego/legoomni/include/hospital.h | 10 +- LEGO1/lego/legoomni/include/infocenter.h | 10 +- LEGO1/lego/legoomni/include/isle.h | 19 +- LEGO1/lego/legoomni/include/jukeboxentity.h | 10 +- .../legoomni/include/legoanimationmanager.h | 10 +- .../legoomni/include/legocharactermanager.h | 6 +- LEGO1/lego/legoomni/include/legogamestate.h | 10 +- LEGO1/lego/legoomni/include/misc.h | 11 +- LEGO1/lego/legoomni/include/policestate.h | 10 +- 36 files changed, 285 insertions(+), 111 deletions(-) create mode 100644 LEGO1/lego/legoomni/include/actions/actionsfwd.h diff --git a/LEGO1/lego/legoomni/include/actions/act2main_actions.h b/LEGO1/lego/legoomni/include/actions/act2main_actions.h index 0dfeb72e..c0163504 100644 --- a/LEGO1/lego/legoomni/include/actions/act2main_actions.h +++ b/LEGO1/lego/legoomni/include/actions/act2main_actions.h @@ -5,7 +5,7 @@ namespace Act2mainScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/act3_actions.h b/LEGO1/lego/legoomni/include/actions/act3_actions.h index c10c229b..c68229ee 100644 --- a/LEGO1/lego/legoomni/include/actions/act3_actions.h +++ b/LEGO1/lego/legoomni/include/actions/act3_actions.h @@ -5,7 +5,7 @@ namespace Act3Script { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/actionsfwd.h b/LEGO1/lego/legoomni/include/actions/actionsfwd.h new file mode 100644 index 00000000..27bfa613 --- /dev/null +++ b/LEGO1/lego/legoomni/include/actions/actionsfwd.h @@ -0,0 +1,246 @@ +// This file was automatically generated by the actionheadergen tool. +// Please do not manually edit this file. +#ifndef ACTIONSFWD_H +#define ACTIONSFWD_H + +namespace SndanimScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace SndanimScript + +namespace NocdScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace NocdScript + +namespace CreditsScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace CreditsScript + +namespace IntroScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace IntroScript + +namespace HospitalScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace HospitalScript + +namespace CarraceScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace CarraceScript + +namespace JetraceScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace JetraceScript + +namespace CarracerScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace CarracerScript + +namespace JetracerScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace JetracerScript + +namespace InfoscorScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace InfoscorScript + +namespace RegbookScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace RegbookScript + +namespace HistbookScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace HistbookScript + +namespace InfomainScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace InfomainScript + +namespace ElevbottScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace ElevbottScript + +namespace InfodoorScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace InfodoorScript + +namespace RacecarScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace RacecarScript + +namespace DunecarScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace DunecarScript + +namespace CopterScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace CopterScript + +namespace JetskiScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace JetskiScript + +namespace GarageScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace GarageScript + +namespace Act3Script +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace Act3Script + +namespace Act2mainScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace Act2mainScript + +namespace JukeboxwScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace JukeboxwScript + +namespace IsleScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif + +#if __cplusplus >= 201103L +enum Script2 : int; +#else +enum Script2; +#endif +} // namespace IsleScript + +namespace JukeboxScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace JukeboxScript + +namespace PoliceScript +{ +#if __cplusplus >= 201103L +enum Script : int; +#else +enum Script; +#endif +} // namespace PoliceScript + +#endif // ACTIONSFWD_H diff --git a/LEGO1/lego/legoomni/include/actions/carrace_actions.h b/LEGO1/lego/legoomni/include/actions/carrace_actions.h index 5084f2bc..8f742ecf 100644 --- a/LEGO1/lego/legoomni/include/actions/carrace_actions.h +++ b/LEGO1/lego/legoomni/include/actions/carrace_actions.h @@ -5,7 +5,7 @@ namespace CarraceScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/carracer_actions.h b/LEGO1/lego/legoomni/include/actions/carracer_actions.h index 7bde84b3..f7b4c43e 100644 --- a/LEGO1/lego/legoomni/include/actions/carracer_actions.h +++ b/LEGO1/lego/legoomni/include/actions/carracer_actions.h @@ -5,7 +5,7 @@ namespace CarracerScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/copter_actions.h b/LEGO1/lego/legoomni/include/actions/copter_actions.h index 749898b6..afdbcbbe 100644 --- a/LEGO1/lego/legoomni/include/actions/copter_actions.h +++ b/LEGO1/lego/legoomni/include/actions/copter_actions.h @@ -5,7 +5,7 @@ namespace CopterScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/credits_actions.h b/LEGO1/lego/legoomni/include/actions/credits_actions.h index a754a15b..b18590eb 100644 --- a/LEGO1/lego/legoomni/include/actions/credits_actions.h +++ b/LEGO1/lego/legoomni/include/actions/credits_actions.h @@ -5,7 +5,7 @@ namespace CreditsScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/dunecar_actions.h b/LEGO1/lego/legoomni/include/actions/dunecar_actions.h index bc1ea6fd..2124a302 100644 --- a/LEGO1/lego/legoomni/include/actions/dunecar_actions.h +++ b/LEGO1/lego/legoomni/include/actions/dunecar_actions.h @@ -5,7 +5,7 @@ namespace DunecarScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/elevbott_actions.h b/LEGO1/lego/legoomni/include/actions/elevbott_actions.h index 45e63778..f858c8cb 100644 --- a/LEGO1/lego/legoomni/include/actions/elevbott_actions.h +++ b/LEGO1/lego/legoomni/include/actions/elevbott_actions.h @@ -5,7 +5,7 @@ namespace ElevbottScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/garage_actions.h b/LEGO1/lego/legoomni/include/actions/garage_actions.h index 8d6988f5..21529b77 100644 --- a/LEGO1/lego/legoomni/include/actions/garage_actions.h +++ b/LEGO1/lego/legoomni/include/actions/garage_actions.h @@ -5,7 +5,7 @@ namespace GarageScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/histbook_actions.h b/LEGO1/lego/legoomni/include/actions/histbook_actions.h index 5ed2df76..d1074140 100644 --- a/LEGO1/lego/legoomni/include/actions/histbook_actions.h +++ b/LEGO1/lego/legoomni/include/actions/histbook_actions.h @@ -5,7 +5,7 @@ namespace HistbookScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/hospital_actions.h b/LEGO1/lego/legoomni/include/actions/hospital_actions.h index f8f52c51..06c3db1c 100644 --- a/LEGO1/lego/legoomni/include/actions/hospital_actions.h +++ b/LEGO1/lego/legoomni/include/actions/hospital_actions.h @@ -5,7 +5,7 @@ namespace HospitalScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/infodoor_actions.h b/LEGO1/lego/legoomni/include/actions/infodoor_actions.h index d422e237..f473c8a6 100644 --- a/LEGO1/lego/legoomni/include/actions/infodoor_actions.h +++ b/LEGO1/lego/legoomni/include/actions/infodoor_actions.h @@ -5,7 +5,7 @@ namespace InfodoorScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/infomain_actions.h b/LEGO1/lego/legoomni/include/actions/infomain_actions.h index 9f0afb9f..273526cb 100644 --- a/LEGO1/lego/legoomni/include/actions/infomain_actions.h +++ b/LEGO1/lego/legoomni/include/actions/infomain_actions.h @@ -5,7 +5,7 @@ namespace InfomainScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/infoscor_actions.h b/LEGO1/lego/legoomni/include/actions/infoscor_actions.h index b1cecbc1..2da8be36 100644 --- a/LEGO1/lego/legoomni/include/actions/infoscor_actions.h +++ b/LEGO1/lego/legoomni/include/actions/infoscor_actions.h @@ -5,7 +5,7 @@ namespace InfoscorScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/intro_actions.h b/LEGO1/lego/legoomni/include/actions/intro_actions.h index 4f882cff..1cda6cc5 100644 --- a/LEGO1/lego/legoomni/include/actions/intro_actions.h +++ b/LEGO1/lego/legoomni/include/actions/intro_actions.h @@ -5,7 +5,7 @@ namespace IntroScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/isle_actions.h b/LEGO1/lego/legoomni/include/actions/isle_actions.h index 4349a8e6..9457a7d2 100644 --- a/LEGO1/lego/legoomni/include/actions/isle_actions.h +++ b/LEGO1/lego/legoomni/include/actions/isle_actions.h @@ -5,7 +5,7 @@ namespace IsleScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { @@ -2017,7 +2017,7 @@ enum Script { c_frt139df_10_sfx = 2005 }; -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script2 : int { #else enum Script2 { diff --git a/LEGO1/lego/legoomni/include/actions/jetrace_actions.h b/LEGO1/lego/legoomni/include/actions/jetrace_actions.h index 82bd9013..5cd77773 100644 --- a/LEGO1/lego/legoomni/include/actions/jetrace_actions.h +++ b/LEGO1/lego/legoomni/include/actions/jetrace_actions.h @@ -5,7 +5,7 @@ namespace JetraceScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/jetracer_actions.h b/LEGO1/lego/legoomni/include/actions/jetracer_actions.h index 01220338..0b8aa2c3 100644 --- a/LEGO1/lego/legoomni/include/actions/jetracer_actions.h +++ b/LEGO1/lego/legoomni/include/actions/jetracer_actions.h @@ -5,7 +5,7 @@ namespace JetracerScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/jetski_actions.h b/LEGO1/lego/legoomni/include/actions/jetski_actions.h index 9984f7b9..ccdb5689 100644 --- a/LEGO1/lego/legoomni/include/actions/jetski_actions.h +++ b/LEGO1/lego/legoomni/include/actions/jetski_actions.h @@ -5,7 +5,7 @@ namespace JetskiScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/jukebox_actions.h b/LEGO1/lego/legoomni/include/actions/jukebox_actions.h index 483b5652..56149d88 100644 --- a/LEGO1/lego/legoomni/include/actions/jukebox_actions.h +++ b/LEGO1/lego/legoomni/include/actions/jukebox_actions.h @@ -5,7 +5,7 @@ namespace JukeboxScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h b/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h index 54be7db8..17af33bf 100644 --- a/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h +++ b/LEGO1/lego/legoomni/include/actions/jukeboxw_actions.h @@ -5,7 +5,7 @@ namespace JukeboxwScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/nocd_actions.h b/LEGO1/lego/legoomni/include/actions/nocd_actions.h index b445e0d7..cd2e664e 100644 --- a/LEGO1/lego/legoomni/include/actions/nocd_actions.h +++ b/LEGO1/lego/legoomni/include/actions/nocd_actions.h @@ -5,7 +5,7 @@ namespace NocdScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/police_actions.h b/LEGO1/lego/legoomni/include/actions/police_actions.h index a9f6cd99..146756d0 100644 --- a/LEGO1/lego/legoomni/include/actions/police_actions.h +++ b/LEGO1/lego/legoomni/include/actions/police_actions.h @@ -5,7 +5,7 @@ namespace PoliceScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/racecar_actions.h b/LEGO1/lego/legoomni/include/actions/racecar_actions.h index 765697aa..0293c25b 100644 --- a/LEGO1/lego/legoomni/include/actions/racecar_actions.h +++ b/LEGO1/lego/legoomni/include/actions/racecar_actions.h @@ -5,7 +5,7 @@ namespace RacecarScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/regbook_actions.h b/LEGO1/lego/legoomni/include/actions/regbook_actions.h index 6f46e2cf..e90b40b5 100644 --- a/LEGO1/lego/legoomni/include/actions/regbook_actions.h +++ b/LEGO1/lego/legoomni/include/actions/regbook_actions.h @@ -5,7 +5,7 @@ namespace RegbookScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/actions/sndanim_actions.h b/LEGO1/lego/legoomni/include/actions/sndanim_actions.h index e52d8832..96b23c93 100644 --- a/LEGO1/lego/legoomni/include/actions/sndanim_actions.h +++ b/LEGO1/lego/legoomni/include/actions/sndanim_actions.h @@ -5,7 +5,7 @@ namespace SndanimScript { -#ifdef COMPAT_MODE +#if __cplusplus >= 201103L enum Script : int { #else enum Script { diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h index 73585c64..c24775dc 100644 --- a/LEGO1/lego/legoomni/include/hospital.h +++ b/LEGO1/lego/legoomni/include/hospital.h @@ -1,6 +1,7 @@ #ifndef HOSPITAL_H #define HOSPITAL_H +#include "actionsfwd.h" #include "decomp.h" #include "hospitalstate.h" #include "legogamestate.h" @@ -8,15 +9,6 @@ #include "mxstillpresenter.h" #include "radio.h" -namespace HospitalScript -{ -#ifdef COMPAT_MODE -enum Script : int; -#else -enum Script; -#endif -} // namespace HospitalScript - // VTABLE: LEGO1 0x100d9730 // SIZE 0x12c class Hospital : public LegoWorld { diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index c2dd079c..e4342fee 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -1,6 +1,7 @@ #ifndef INFOCENTER_H #define INFOCENTER_H +#include "actionsfwd.h" #include "legogamestate.h" #include "legoworld.h" #include "mxrect32.h" @@ -10,15 +11,6 @@ class InfocenterState; class MxStillPresenter; class LegoControlManagerEvent; -namespace InfomainScript -{ -#ifdef COMPAT_MODE -enum Script : int; -#else -enum Script; -#endif -} // namespace InfomainScript - // SIZE 0x18 struct InfocenterMapEntry { // FUNCTION: LEGO1 0x1006ec80 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/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h index f992ea37..4166cf1e 100644 --- a/LEGO1/lego/legoomni/include/jukeboxentity.h +++ b/LEGO1/lego/legoomni/include/jukeboxentity.h @@ -1,17 +1,9 @@ #ifndef JUKEBOXENTITY_H #define JUKEBOXENTITY_H +#include "actionsfwd.h" #include "legoentity.h" -namespace JukeboxScript -{ -#ifdef COMPAT_MODE -enum Script : int; -#else -enum Script; -#endif -} // namespace JukeboxScript - // VTABLE: LEGO1 0x100da8a0 // SIZE 0x6c class JukeBoxEntity : public LegoEntity { 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/legocharactermanager.h b/LEGO1/lego/legoomni/include/legocharactermanager.h index 8e657db3..4d7ea084 100644 --- a/LEGO1/lego/legoomni/include/legocharactermanager.h +++ b/LEGO1/lego/legoomni/include/legocharactermanager.h @@ -19,9 +19,6 @@ struct LegoCharacterComparator { // SIZE 0x08 struct LegoCharacter { - LegoROI* m_roi; // 0x00 - MxU32 m_refCount; // 0x04 - LegoCharacter(LegoROI* p_roi) { m_roi = p_roi; @@ -29,6 +26,9 @@ struct LegoCharacter { } inline void AddRef() { m_refCount++; } + + LegoROI* m_roi; // 0x00 + MxU32 m_refCount; // 0x04 }; typedef map LegoCharacterMap; diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index 86549a54..f6fc965e 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -1,6 +1,7 @@ #ifndef LEGOGAMESTATE_H #define LEGOGAMESTATE_H +#include "actionsfwd.h" #include "decomp.h" #include "legobackgroundcolor.h" #include "legofullscreenmovie.h" @@ -17,15 +18,6 @@ struct ColorStringStruct { const char* m_colorName; }; -namespace JukeboxScript -{ -#ifdef COMPAT_MODE -enum Script : int; -#else -enum Script; -#endif -} // namespace JukeboxScript - // SIZE 0x430 class LegoGameState { public: diff --git a/LEGO1/lego/legoomni/include/misc.h b/LEGO1/lego/legoomni/include/misc.h index 98d4b352..b5bafcbe 100644 --- a/LEGO1/lego/legoomni/include/misc.h +++ b/LEGO1/lego/legoomni/include/misc.h @@ -3,6 +3,8 @@ #include "compat.h" #include "decomp.h" +// Long include path due to dependency of misc library on LegoOmni +#include "lego/legoomni/include/actions/actionsfwd.h" #include "mxtypes.h" class IslePathActor; @@ -27,15 +29,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(); diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h index 3deaff35..4fe5d711 100644 --- a/LEGO1/lego/legoomni/include/policestate.h +++ b/LEGO1/lego/legoomni/include/policestate.h @@ -1,19 +1,11 @@ #ifndef POLICESTATE_H #define POLICESTATE_H +#include "actionsfwd.h" #include "decomp.h" #include "legostate.h" #include "police.h" -namespace PoliceScript -{ -#ifdef COMPAT_MODE -enum Script : int; -#else -enum Script; -#endif -} // namespace PoliceScript - // VTABLE: LEGO1 0x100d8af0 // SIZE 0x10 class PoliceState : public LegoState {