From 51adf75b9bc3edfc3affc889d2cf119e7056626d Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 3 May 2024 12:19:12 -0400 Subject: [PATCH] (Refactor) Use more forward declarations (#881) * Use more forward declarations * Use more forward declarations * Add more forward declarations * Fix --- ISLE/isleapp.cpp | 4 ++++ LEGO1/lego/legoomni/include/act1state.h | 4 ++-- LEGO1/lego/legoomni/include/ambulance.h | 3 ++- LEGO1/lego/legoomni/include/gasstation.h | 5 +++-- LEGO1/lego/legoomni/include/helicopter.h | 3 ++- LEGO1/lego/legoomni/include/historybook.h | 3 ++- LEGO1/lego/legoomni/include/hospital.h | 8 +++++--- LEGO1/lego/legoomni/include/infocenter.h | 1 + LEGO1/lego/legoomni/include/infocenterstate.h | 3 ++- LEGO1/lego/legoomni/include/isleactor.h | 6 ++++-- LEGO1/lego/legoomni/include/jetski.h | 3 ++- LEGO1/lego/legoomni/include/jukebox.h | 5 +++-- LEGO1/lego/legoomni/include/legoact2.h | 2 -- .../legoomni/include/legoactioncontrolpresenter.h | 5 +++-- LEGO1/lego/legoomni/include/legoactor.h | 3 ++- LEGO1/lego/legoomni/include/legoanimactor.h | 3 ++- LEGO1/lego/legoomni/include/legoanimationmanager.h | 5 ++++- LEGO1/lego/legoomni/include/legoanimmmpresenter.h | 2 +- LEGO1/lego/legoomni/include/legoanimpresenter.h | 8 ++++---- LEGO1/lego/legoomni/include/legobuildingmanager.h | 2 +- LEGO1/lego/legoomni/include/legocachesoundmanager.h | 2 ++ LEGO1/lego/legoomni/include/legocameracontroller.h | 1 - .../lego/legoomni/include/legocarbuildanimpresenter.h | 1 + LEGO1/lego/legoomni/include/legocharactermanager.h | 7 ++++--- LEGO1/lego/legoomni/include/legoentity.h | 7 ++++--- LEGO1/lego/legoomni/include/legoentitylist.h | 3 +-- LEGO1/lego/legoomni/include/legoentitypresenter.h | 1 + .../legoomni/include/legoeventnotificationparam.h | 3 ++- LEGO1/lego/legoomni/include/legogamestate.h | 11 +++++++---- LEGO1/lego/legoomni/include/legoinputmanager.h | 3 ++- LEGO1/lego/legoomni/include/legometerpresenter.h | 1 + LEGO1/lego/legoomni/include/legonavcontroller.h | 3 ++- LEGO1/lego/legoomni/include/legopalettepresenter.h | 3 ++- LEGO1/lego/legoomni/include/legopathactor.h | 5 +++-- LEGO1/lego/legoomni/include/legopathboundary.h | 3 +-- LEGO1/lego/legoomni/include/legopathcontroller.h | 5 ++++- LEGO1/lego/legoomni/include/legopathpresenter.h | 1 + LEGO1/lego/legoomni/include/legoplantmanager.h | 2 +- LEGO1/lego/legoomni/include/legoraceactor.h | 3 ++- LEGO1/lego/legoomni/include/legoracecar.h | 1 - LEGO1/lego/legoomni/include/legosoundmanager.h | 3 ++- LEGO1/lego/legoomni/include/legostate.h | 1 - LEGO1/lego/legoomni/include/legotraninfo.h | 1 + LEGO1/lego/legoomni/include/legounknown100d5778.h | 3 ++- LEGO1/lego/legoomni/include/legoutils.h | 5 +---- LEGO1/lego/legoomni/include/legovideomanager.h | 11 ++++++++--- LEGO1/lego/legoomni/include/legoworld.h | 5 ++--- LEGO1/lego/legoomni/include/misc.h | 4 +--- .../lego/legoomni/include/mxbackgroundaudiomanager.h | 5 ++--- LEGO1/lego/legoomni/include/police.h | 5 +++-- LEGO1/lego/legoomni/include/policestate.h | 1 - LEGO1/lego/legoomni/include/radio.h | 7 ++++--- LEGO1/lego/legoomni/include/radiostate.h | 3 ++- LEGO1/lego/legoomni/include/registrationbook.h | 6 ++---- LEGO1/lego/legoomni/include/score.h | 8 ++++---- LEGO1/lego/legoomni/src/act1/act1state.cpp | 1 + LEGO1/lego/legoomni/src/actors/ambulance.cpp | 3 +++ LEGO1/lego/legoomni/src/actors/helicopter.cpp | 2 ++ LEGO1/lego/legoomni/src/actors/islepathactor.cpp | 4 ++++ LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp | 1 + LEGO1/lego/legoomni/src/actors/radio.cpp | 3 +++ LEGO1/lego/legoomni/src/actors/skateboard.cpp | 2 ++ .../src/audio/legoloadcachesoundpresenter.cpp | 2 ++ LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp | 1 + .../legoomni/src/audio/mxbackgroundaudiomanager.cpp | 2 ++ LEGO1/lego/legoomni/src/build/buildingentity.cpp | 1 + .../src/common/legoactioncontrolpresenter.cpp | 2 ++ .../lego/legoomni/src/common/legoanimationmanager.cpp | 6 +++++- .../lego/legoomni/src/common/legoanimmmpresenter.cpp | 1 + .../lego/legoomni/src/common/legobackgroundcolor.cpp | 3 +++ .../lego/legoomni/src/common/legocharactermanager.cpp | 7 ++++++- LEGO1/lego/legoomni/src/common/legogamestate.cpp | 6 ++++++ LEGO1/lego/legoomni/src/common/legotextureinfo.cpp | 1 + LEGO1/lego/legoomni/src/common/legoutils.cpp | 6 ++++++ LEGO1/lego/legoomni/src/common/legovariables.cpp | 1 + LEGO1/lego/legoomni/src/common/misc.cpp | 5 +++++ .../lego/legoomni/src/common/mxtransitionmanager.cpp | 1 + .../lego/legoomni/src/control/legocontrolmanager.cpp | 1 + .../lego/legoomni/src/control/legometerpresenter.cpp | 1 + LEGO1/lego/legoomni/src/entity/legoactor.cpp | 2 ++ .../lego/legoomni/src/entity/legocameracontroller.cpp | 2 ++ LEGO1/lego/legoomni/src/entity/legoentity.cpp | 4 ++++ LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp | 5 +++++ LEGO1/lego/legoomni/src/entity/legoworld.cpp | 5 +++++ .../lego/legoomni/src/infocenter/infocenterstate.cpp | 1 + LEGO1/lego/legoomni/src/input/legoinputmanager.cpp | 2 ++ LEGO1/lego/legoomni/src/main/legoomni.cpp | 5 +++++ LEGO1/lego/legoomni/src/paths/legoanimactor.cpp | 1 + LEGO1/lego/legoomni/src/paths/legoextraactor.cpp | 3 +++ LEGO1/lego/legoomni/src/paths/legopathactor.cpp | 5 +++++ LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp | 3 +++ LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp | 6 ++++++ LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 3 +++ .../lego/legoomni/src/video/legopalettepresenter.cpp | 3 +++ LEGO1/lego/legoomni/src/video/legopartpresenter.cpp | 3 +++ .../lego/legoomni/src/video/legophonemepresenter.cpp | 2 ++ .../lego/legoomni/src/video/legotexturepresenter.cpp | 2 ++ LEGO1/lego/legoomni/src/video/legovideomanager.cpp | 7 +++++++ LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp | 1 + LEGO1/lego/legoomni/src/worlds/gasstation.cpp | 2 ++ LEGO1/lego/legoomni/src/worlds/historybook.cpp | 1 + LEGO1/lego/legoomni/src/worlds/hospital.cpp | 3 +++ LEGO1/lego/legoomni/src/worlds/infocenter.cpp | 4 ++++ LEGO1/lego/legoomni/src/worlds/isle.cpp | 4 ++++ LEGO1/lego/legoomni/src/worlds/police.cpp | 1 + LEGO1/lego/legoomni/src/worlds/registrationbook.cpp | 2 ++ LEGO1/lego/legoomni/src/worlds/score.cpp | 2 ++ LEGO1/lego/sources/3dmanager/lego3dmanager.cpp | 1 + LEGO1/lego/sources/3dmanager/lego3dview.h | 4 +++- LEGO1/lego/sources/anim/legoanim.h | 3 ++- LEGO1/lego/sources/geom/legoedge.h | 2 +- LEGO1/lego/sources/misc/legocontainer.cpp | 1 + LEGO1/lego/sources/misc/legounknown.h | 3 ++- LEGO1/omni/include/mxatom.h | 4 ++-- LEGO1/omni/include/mxautolock.h | 2 +- LEGO1/omni/include/mxbitmap.h | 4 +++- LEGO1/omni/include/mxcompositepresenter.h | 4 +++- LEGO1/omni/include/mxdiskstreamcontroller.h | 3 ++- LEGO1/omni/include/mxdisplaysurface.h | 5 +++-- LEGO1/omni/include/mxdsactionlist.h | 5 ++--- LEGO1/omni/include/mxdsmediaaction.h | 1 - LEGO1/omni/include/mxdssubscriber.h | 2 -- LEGO1/omni/include/mxmediamanager.h | 3 ++- LEGO1/omni/include/mxmediapresenter.h | 3 ++- LEGO1/omni/include/mxmidipresenter.h | 5 +++-- LEGO1/omni/include/mxnotificationmanager.h | 3 ++- LEGO1/omni/include/mxomnicreateflags.h | 1 + LEGO1/omni/include/mxomnicreateparam.h | 8 ++++---- LEGO1/omni/include/mxpresenter.h | 5 +++-- LEGO1/omni/include/mxramstreamcontroller.h | 3 ++- LEGO1/omni/include/mxsmack.h | 3 ++- LEGO1/omni/include/mxstreamchunk.h | 1 - LEGO1/omni/include/mxstreamchunklist.h | 3 +-- LEGO1/omni/include/mxstreamcontroller.h | 4 +--- LEGO1/omni/include/mxstreamer.h | 8 +++++--- LEGO1/omni/include/mxstreamprovider.h | 2 +- LEGO1/omni/include/mxvariable.h | 2 ++ LEGO1/omni/include/mxvideomanager.h | 7 ++++--- LEGO1/omni/include/mxvideoparam.h | 4 ++-- LEGO1/omni/include/mxvideopresenter.h | 2 ++ LEGO1/omni/src/audio/mxmidipresenter.cpp | 1 + LEGO1/omni/src/audio/mxmusicmanager.cpp | 1 + LEGO1/omni/src/audio/mxsoundmanager.cpp | 2 ++ LEGO1/omni/src/audio/mxwavepresenter.cpp | 1 + LEGO1/omni/src/common/mxcompositepresenter.cpp | 1 + LEGO1/omni/src/common/mxmediapresenter.cpp | 1 + LEGO1/omni/src/event/mxeventpresenter.cpp | 2 ++ LEGO1/omni/src/main/mxomni.cpp | 1 + LEGO1/omni/src/main/mxomnicreateflags.cpp | 4 ++++ LEGO1/omni/src/main/mxomnicreateparam.cpp | 4 ++++ LEGO1/omni/src/notify/mxnotificationmanager.cpp | 1 + LEGO1/omni/src/stream/mxdiskstreamprovider.cpp | 1 + LEGO1/omni/src/stream/mxdsbuffer.cpp | 1 + LEGO1/omni/src/stream/mxramstreamprovider.cpp | 1 + LEGO1/omni/src/stream/mxstreamcontroller.cpp | 1 + LEGO1/omni/src/system/mxautolock.cpp | 2 ++ LEGO1/omni/src/video/mxbitmap.cpp | 1 + LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 ++ LEGO1/omni/src/video/mxloopingflcpresenter.cpp | 2 ++ LEGO1/omni/src/video/mxloopingsmkpresenter.cpp | 1 + LEGO1/omni/src/video/mxsmack.cpp | 2 ++ LEGO1/omni/src/video/mxsmkpresenter.cpp | 1 + LEGO1/omni/src/video/mxstillpresenter.cpp | 3 +++ LEGO1/omni/src/video/mxvideomanager.cpp | 4 ++++ LEGO1/omni/src/video/mxvideopresenter.cpp | 2 ++ 165 files changed, 377 insertions(+), 136 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 44420792..bb017de3 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -1,5 +1,6 @@ #include "isleapp.h" +#include "3dmanager/lego3dmanager.h" #include "decomp.h" #include "legoanimationmanager.h" #include "legobuildingmanager.h" @@ -12,6 +13,7 @@ #include "legoworldpresenter.h" #include "misc.h" #include "mxbackgroundaudiomanager.h" +#include "mxdirectx/mxdirect3d.h" #include "mxdsaction.h" #include "mxmisc.h" #include "mxomnicreateflags.h" @@ -20,7 +22,9 @@ #include "mxticklemanager.h" #include "mxtimer.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" #include "res/resource.h" +#include "roi/legoroi.h" #include "viewmanager/viewmanager.h" #include diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h index db99ec6a..dcc09959 100644 --- a/LEGO1/lego/legoomni/include/act1state.h +++ b/LEGO1/lego/legoomni/include/act1state.h @@ -1,9 +1,9 @@ #ifndef ACT1STATE_H #define ACT1STATE_H -#include "legonamedtexture.h" #include "legostate.h" -#include "roi/legoroi.h" + +class LegoNamedTexture; // VTABLE: LEGO1 0x100d7028 // SIZE 0x26c diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h index 99615f9e..1aff83a0 100644 --- a/LEGO1/lego/legoomni/include/ambulance.h +++ b/LEGO1/lego/legoomni/include/ambulance.h @@ -1,9 +1,10 @@ #ifndef AMBULANCE_H #define AMBULANCE_H -#include "ambulancemissionstate.h" #include "islepathactor.h" +class AmbulanceMissionState; + // VTABLE: LEGO1 0x100d71a8 // SIZE 0x184 class Ambulance : public IslePathActor { diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h index 9071aba5..c6dd28d5 100644 --- a/LEGO1/lego/legoomni/include/gasstation.h +++ b/LEGO1/lego/legoomni/include/gasstation.h @@ -2,12 +2,13 @@ #define GASSTATION_H #include "decomp.h" -#include "gasstationstate.h" #include "legogamestate.h" #include "legoworld.h" -#include "mxstillpresenter.h" #include "radio.h" +class GasStationState; +class MxStillPresenter; + // VTABLE: LEGO1 0x100d4650 // SIZE 0x128 class GasStation : public LegoWorld { diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h index 3c7e8b5d..b568390a 100644 --- a/LEGO1/lego/legoomni/include/helicopter.h +++ b/LEGO1/lego/legoomni/include/helicopter.h @@ -1,10 +1,11 @@ #ifndef HELICOPTER_H #define HELICOPTER_H -#include "helicopterstate.h" #include "islepathactor.h" #include "realtime/matrix.h" +class HelicopterState; + // VTABLE: LEGO1 0x100d40f8 // SIZE 0x230 class Helicopter : public IslePathActor { diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h index d7a79705..af3b9be2 100644 --- a/LEGO1/lego/legoomni/include/historybook.h +++ b/LEGO1/lego/legoomni/include/historybook.h @@ -4,7 +4,8 @@ #include "decomp.h" #include "legogamestate.h" #include "legoworld.h" -#include "mxstillpresenter.h" + +class MxStillPresenter; // VTABLE: LEGO1 0x100da328 // SIZE 0x3e4 diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h index 9595988f..40f4f947 100644 --- a/LEGO1/lego/legoomni/include/hospital.h +++ b/LEGO1/lego/legoomni/include/hospital.h @@ -3,11 +3,13 @@ #include "actionsfwd.h" #include "decomp.h" -#include "hospitalstate.h" #include "legogamestate.h" #include "legoworld.h" -#include "mxstillpresenter.h" -#include "radio.h" + +class HospitalState; +class LegoControlManagerEvent; +class MxEndActionNotificationParam; +class MxStillPresenter; // VTABLE: LEGO1 0x100d9730 // SIZE 0x12c diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index e4342fee..04b56757 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -8,6 +8,7 @@ #include "radio.h" class InfocenterState; +class MxNotificationParam; class MxStillPresenter; class LegoControlManagerEvent; diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h index e154f42e..05b0ed83 100644 --- a/LEGO1/lego/legoomni/include/infocenterstate.h +++ b/LEGO1/lego/legoomni/include/infocenterstate.h @@ -4,7 +4,8 @@ #include "decomp.h" #include "legogamestate.h" #include "legostate.h" -#include "mxstillpresenter.h" + +class MxStillPresenter; // VTABLE: LEGO1 0x100d93a8 // SIZE 0x94 diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h index 6e337454..1affab4a 100644 --- a/LEGO1/lego/legoomni/include/isleactor.h +++ b/LEGO1/lego/legoomni/include/isleactor.h @@ -2,8 +2,10 @@ #define ISLEACTOR_H #include "legoactor.h" -#include "legoworld.h" -#include "mxactionnotificationparam.h" + +class LegoWorld; +class MxEndActionNotificationParam; +class MxNotificationParam; // VTABLE: LEGO1 0x100d5178 // SIZE 0x7c diff --git a/LEGO1/lego/legoomni/include/jetski.h b/LEGO1/lego/legoomni/include/jetski.h index 92147be9..263b2a4f 100644 --- a/LEGO1/lego/legoomni/include/jetski.h +++ b/LEGO1/lego/legoomni/include/jetski.h @@ -3,7 +3,8 @@ #include "decomp.h" #include "islepathactor.h" -#include "legocontrolmanager.h" + +class LegoControlManagerEvent; // VTABLE: LEGO1 0x100d9ec8 // SIZE 0x164 diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h index f5778dda..260fb9a5 100644 --- a/LEGO1/lego/legoomni/include/jukebox.h +++ b/LEGO1/lego/legoomni/include/jukebox.h @@ -2,11 +2,12 @@ #define JUKEBOX_H #include "decomp.h" -#include "jukeboxstate.h" -#include "legocontrolmanager.h" #include "legogamestate.h" #include "legoworld.h" +class LegoControlManagerEvent; +class JukeBoxState; + // VTABLE: LEGO1 0x100d8958 // SIZE 0x104 class JukeBox : public LegoWorld { diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h index f0ee58dd..c7dd6a35 100644 --- a/LEGO1/lego/legoomni/include/legoact2.h +++ b/LEGO1/lego/legoomni/include/legoact2.h @@ -2,8 +2,6 @@ #define LEGOACT2_H #include "act2brick.h" -#include "legocarraceactor.h" -#include "legopathactor.h" #include "legoworld.h" // VTABLE: LEGO1 0x100d82e0 diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h index 7bc6b005..98ee03f2 100644 --- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h +++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h @@ -2,14 +2,15 @@ #define LEGOACTIONCONTROLPRESENTER_H #include "decomp.h" -#include "legoutils.h" +#include "extra.h" #include "mxmediapresenter.h" +#include "mxstring.h" // VTABLE: LEGO1 0x100d5118 // SIZE 0x68 class LegoActionControlPresenter : public MxMediaPresenter { public: - inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; } + LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; } ~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00 // FUNCTION: LEGO1 0x1000d0e0 diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h index 358ca600..ebde373c 100644 --- a/LEGO1/lego/legoomni/include/legoactor.h +++ b/LEGO1/lego/legoomni/include/legoactor.h @@ -2,9 +2,10 @@ #define LEGOACTOR_H #include "decomp.h" -#include "legocachsound.h" #include "legoentity.h" +class LegoCacheSound; + // VTABLE: LEGO1 0x100d6d68 // SIZE 0x78 class LegoActor : public LegoEntity { diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h index 91eafd11..296c48d0 100644 --- a/LEGO1/lego/legoomni/include/legoanimactor.h +++ b/LEGO1/lego/legoomni/include/legoanimactor.h @@ -1,10 +1,11 @@ #ifndef LEGOANIMACTOR_H #define LEGOANIMACTOR_H -#include "anim/legoanim.h" #include "decomp.h" #include "legopathactor.h" +class LegoAnim; + // SIZE 0x20 struct LegoAnimActorStruct { LegoAnimActorStruct(float p_unk0x00, LegoAnim* p_AnimTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs); diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index ebebbbef..56efee8c 100644 --- a/LEGO1/lego/legoomni/include/legoanimationmanager.h +++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h @@ -2,15 +2,18 @@ #define LEGOANIMATIONMANAGER_H #include "actionsfwd.h" -#include "animstate.h" #include "decomp.h" #include "legotraninfolist.h" #include "mxcore.h" +#include "mxgeometry/mxgeometry3d.h" +class AnimState; class LegoAnimPresenter; class LegoEntity; +class LegoFile; class LegoPathBoundary; class LegoROIList; +struct ModelInfo; class MxDSAction; // SIZE 0x18 diff --git a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h index f7e793d4..0d90473b 100644 --- a/LEGO1/lego/legoomni/include/legoanimmmpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h @@ -2,12 +2,12 @@ #define LEGOANIMMMPRESENTER_H #include "mxcompositepresenter.h" -#include "mxgeometry/mxmatrix.h" class LegoAnimPresenter; class LegoWorld; class LegoROI; struct LegoTranInfo; +class MxMatrix; // VTABLE: LEGO1 0x100d7de8 // SIZE 0x74 diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h index 30e5201c..4e51ebb4 100644 --- a/LEGO1/lego/legoomni/include/legoanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h @@ -1,16 +1,16 @@ #ifndef LEGOANIMPRESENTER_H #define LEGOANIMPRESENTER_H -#include "anim/legoanim.h" #include "legoroilist.h" -#include "mxgeometry/mxgeometry3d.h" -#include "mxgeometry/mxmatrix.h" +#include "mxatom.h" #include "mxvideopresenter.h" +class LegoAnim; class LegoWorld; -class LegoAnimClass; class LegoAnimActor; class LegoPathBoundary; +class MxMatrix; +class Vector3; struct LegoAnimStructComparator { MxBool operator()(const char* const& p_a, const char* const& p_b) const { return strcmp(p_a, p_b) < 0; } diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h index b82b7b06..380a1c99 100644 --- a/LEGO1/lego/legoomni/include/legobuildingmanager.h +++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h @@ -2,11 +2,11 @@ #define LEGOBUILDINGMANAGER_H #include "decomp.h" -#include "misc/legostorage.h" #include "mxcore.h" class LegoEntity; class LegoROI; +class LegoStorage; // VTABLE: LEGO1 0x100d6f50 // SIZE 0x30 diff --git a/LEGO1/lego/legoomni/include/legocachesoundmanager.h b/LEGO1/lego/legoomni/include/legocachesoundmanager.h index f326c35d..67d139ff 100644 --- a/LEGO1/lego/legoomni/include/legocachesoundmanager.h +++ b/LEGO1/lego/legoomni/include/legocachesoundmanager.h @@ -6,6 +6,8 @@ #include "mxstl/stlcompat.h" #include "mxtypes.h" +#pragma warning(disable : 4237) + // SIZE 0x08 struct LegoCacheSoundEntry { LegoCacheSoundEntry() : m_sound(NULL), m_name(NULL) {} diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h index 50439347..f7325286 100644 --- a/LEGO1/lego/legoomni/include/legocameracontroller.h +++ b/LEGO1/lego/legoomni/include/legocameracontroller.h @@ -2,7 +2,6 @@ #define LEGOCAMERACONTROLLER_H #include "legopointofviewcontroller.h" -#include "mxcore.h" #include "mxgeometry/mxgeometry3d.h" #include "mxgeometry/mxmatrix.h" #include "mxpoint32.h" diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h index 55036496..5b72d2be 100644 --- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h @@ -1,6 +1,7 @@ #ifndef LEGOCARBUILDANIMPRESENTER_H #define LEGOCARBUILDANIMPRESENTER_H +#include "anim/legoanim.h" #include "legoanimpresenter.h" // VTABLE: LEGO1 0x100d99e0 diff --git a/LEGO1/lego/legoomni/include/legocharactermanager.h b/LEGO1/lego/legoomni/include/legocharactermanager.h index 1b8610f8..7bd6e987 100644 --- a/LEGO1/lego/legoomni/include/legocharactermanager.h +++ b/LEGO1/lego/legoomni/include/legocharactermanager.h @@ -2,13 +2,14 @@ #define LEGOCHARACTERMANAGER_H #include "decomp.h" -#include "legoextraactor.h" -#include "legovariables.h" -#include "misc/legostorage.h" #include "mxstl/stlcompat.h" #include "mxtypes.h" +#include "roi/legoroi.h" +class CustomizeAnimFileVariable; class LegoActor; +class LegoExtraActor; +class LegoStorage; class LegoROI; #pragma warning(disable : 4237) diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h index 9b44c4d8..034dc700 100644 --- a/LEGO1/lego/legoomni/include/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -3,10 +3,11 @@ #include "decomp.h" #include "extra.h" -#include "mxdsaction.h" #include "mxentity.h" -#include "realtime/vector.h" -#include "roi/legoroi.h" + +class LegoROI; +class MxDSAction; +class Vector3; // VTABLE: LEGO1 0x100d4858 // SIZE 0x68 diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h index 783692b3..2a7320af 100644 --- a/LEGO1/lego/legoomni/include/legoentitylist.h +++ b/LEGO1/lego/legoomni/include/legoentitylist.h @@ -1,11 +1,10 @@ #ifndef LEGOENTITYLIST_H #define LEGOENTITYLIST_H +#include "legoentity.h" #include "mxlist.h" #include "mxtypes.h" -class LegoEntity; - // VTABLE: LEGO1 0x100d6410 // class MxCollection diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h index 4e98eb5b..e8bf6ff1 100644 --- a/LEGO1/lego/legoomni/include/legoentitypresenter.h +++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h @@ -4,6 +4,7 @@ #include "mxcompositepresenter.h" class LegoEntity; +class Vector3; // VTABLE: LEGO1 0x100d8398 // SIZE 0x50 diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h index 732d4894..cdd771e3 100644 --- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h +++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h @@ -3,10 +3,11 @@ #include "mxnotificationparam.h" #include "mxtypes.h" -#include "roi/legoroi.h" #include +class LegoROI; + // VTABLE: LEGO1 0x100d6aa0 // SIZE 0x20 class LegoEventNotificationParam : public MxNotificationParam { diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index 32d0b754..05f24c5f 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -3,14 +3,17 @@ #include "actionsfwd.h" #include "decomp.h" -#include "legobackgroundcolor.h" -#include "legofullscreenmovie.h" -#include "misc/legostorage.h" #include "mxtypes.h" -#include "mxvariabletable.h" +#include + +class LegoBackgroundColor; +class LegoFile; +class LegoFullScreenMovie; class LegoState; +class LegoStorage; class MxVariable; +class MxVariableTable; class MxString; // SIZE 0x08 diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h index f103360c..2bd7e26b 100644 --- a/LEGO1/lego/legoomni/include/legoinputmanager.h +++ b/LEGO1/lego/legoomni/include/legoinputmanager.h @@ -3,14 +3,15 @@ #include "decomp.h" #include "legoeventnotificationparam.h" -#include "legoworld.h" #include "mxlist.h" #include "mxpresenter.h" #include "mxqueue.h" #include +class LegoCameraController; class LegoControlManager; +class LegoWorld; extern MxS32 g_unk0x100f31b0; extern const char* g_unk0x100f31b4; diff --git a/LEGO1/lego/legoomni/include/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h index 8bb57608..ad43944d 100644 --- a/LEGO1/lego/legoomni/include/legometerpresenter.h +++ b/LEGO1/lego/legoomni/include/legometerpresenter.h @@ -2,6 +2,7 @@ #define LEGOMETERPRESENTER_H #include "mxstillpresenter.h" +#include "mxstring.h" // VTABLE: LEGO1 0x100d7ac8 // SIZE 0x94 diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h index ef2d204e..fdf0b5f3 100644 --- a/LEGO1/lego/legoomni/include/legonavcontroller.h +++ b/LEGO1/lego/legoomni/include/legonavcontroller.h @@ -4,7 +4,8 @@ #include "decomp.h" #include "mxcore.h" #include "mxtypes.h" -#include "realtime/vector.h" + +class Vector3; ////////////////////////////////////////////////////////////////////////////// // diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h index c9e7fb81..d6906540 100644 --- a/LEGO1/lego/legoomni/include/legopalettepresenter.h +++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h @@ -2,9 +2,10 @@ #define LEGOPALETTEPRESENTER_H #include "decomp.h" -#include "mxpalette.h" #include "mxvideopresenter.h" +class MxPalette; + // VTABLE: LEGO1 0x100d9aa0 // SIZE 0x68 class LegoPalettePresenter : public MxVideoPresenter { diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h index e9488e8e..86b67ac2 100644 --- a/LEGO1/lego/legoomni/include/legopathactor.h +++ b/LEGO1/lego/legoomni/include/legopathactor.h @@ -1,14 +1,15 @@ #ifndef LEGOPATHACTOR_H #define LEGOPATHACTOR_H -#include "geom/legounkown100db7f4.h" #include "legoactor.h" #include "misc/legounknown.h" +#include "mxgeometry/mxmatrix.h" #include "mxtypes.h" -#include "realtime/matrix.h" +struct LegoEdge; class LegoPathBoundary; class LegoPathController; +class LegoUnknown100db7f4; // VTABLE: LEGO1 0x100d6e28 // SIZE 0x154 diff --git a/LEGO1/lego/legoomni/include/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h index 024e85d2..393ab9ed 100644 --- a/LEGO1/lego/legoomni/include/legopathboundary.h +++ b/LEGO1/lego/legoomni/include/legopathboundary.h @@ -3,11 +3,10 @@ #include "geom/legowegedge.h" #include "legoanimpresenter.h" +#include "legopathactor.h" #include "mxstl/stlcompat.h" #include "mxtypes.h" -class LegoPathActor; - struct LegoPathActorSetCompare { MxU32 operator()(const LegoPathActor* p_lhs, const LegoPathActor* p_rhs) const { diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h index 5a55fa0e..ac4c0bdc 100644 --- a/LEGO1/lego/legoomni/include/legopathcontroller.h +++ b/LEGO1/lego/legoomni/include/legopathcontroller.h @@ -2,12 +2,15 @@ #define LEGOPATHCONTROLLER_H #include "decomp.h" -#include "legopathactor.h" #include "mxcore.h" +#include "mxstl/stlcompat.h" class LegoAnimPresenter; +class LegoPathActor; class LegoPathBoundary; class LegoWorld; +class MxAtomId; +class Vector3; struct LegoPathControllerComparator { MxBool operator()(const undefined*, const undefined*) const { return 0; } diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h index 6477c2c0..9e3f0f0f 100644 --- a/LEGO1/lego/legoomni/include/legopathpresenter.h +++ b/LEGO1/lego/legoomni/include/legopathpresenter.h @@ -1,6 +1,7 @@ #ifndef LEGOPATHPRESENTER_H #define LEGOPATHPRESENTER_H +#include "mxatom.h" #include "mxmediapresenter.h" // VTABLE: LEGO1 0x100d7c10 diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h index 3094f33c..e2eccd80 100644 --- a/LEGO1/lego/legoomni/include/legoplantmanager.h +++ b/LEGO1/lego/legoomni/include/legoplantmanager.h @@ -2,11 +2,11 @@ #define LEGOPLANTMANAGER_H #include "decomp.h" -#include "misc/legostorage.h" #include "mxcore.h" class LegoEntity; class LegoROI; +class LegoStorage; // VTABLE: LEGO1 0x100d6758 // SIZE 0x2c diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h index 9ae2d92e..92f1e8c7 100644 --- a/LEGO1/lego/legoomni/include/legoraceactor.h +++ b/LEGO1/lego/legoomni/include/legoraceactor.h @@ -2,7 +2,8 @@ #define LEGORACEACTOR_H #include "legoanimactor.h" -#include "realtime/matrix.h" + +class Matrix4; /* VTABLE: LEGO1 0x100d5b78 LegoAnimActor diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h index 4c7db772..d090b686 100644 --- a/LEGO1/lego/legoomni/include/legoracecar.h +++ b/LEGO1/lego/legoomni/include/legoracecar.h @@ -2,7 +2,6 @@ #define LEGORACECAR_H #include "legocarraceactor.h" -#include "legopathactor.h" #include "legoracemap.h" /* diff --git a/LEGO1/lego/legoomni/include/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h index e7dd809e..ad46bf8f 100644 --- a/LEGO1/lego/legoomni/include/legosoundmanager.h +++ b/LEGO1/lego/legoomni/include/legosoundmanager.h @@ -1,9 +1,10 @@ #ifndef LEGOSOUNDMANAGER_H #define LEGOSOUNDMANAGER_H -#include "legocachesoundmanager.h" #include "mxsoundmanager.h" +class LegoCacheSoundManager; + // VTABLE: LEGO1 0x100d6b10 // SIZE 0x44 class LegoSoundManager : public MxSoundManager { diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h index b3ba9e31..21ddde85 100644 --- a/LEGO1/lego/legoomni/include/legostate.h +++ b/LEGO1/lego/legoomni/include/legostate.h @@ -4,7 +4,6 @@ #include "decomp.h" #include "misc/legostorage.h" #include "mxcore.h" -#include "mxstring.h" // VTABLE: LEGO1 0x100d46c0 // SIZE 0x08 diff --git a/LEGO1/lego/legoomni/include/legotraninfo.h b/LEGO1/lego/legoomni/include/legotraninfo.h index 89fdabb9..3ded0903 100644 --- a/LEGO1/lego/legoomni/include/legotraninfo.h +++ b/LEGO1/lego/legoomni/include/legotraninfo.h @@ -3,6 +3,7 @@ #include "decomp.h" #include "mxgeometry/mxmatrix.h" +#include "mxtypes.h" struct AnimInfo; class LegoAnimMMPresenter; diff --git a/LEGO1/lego/legoomni/include/legounknown100d5778.h b/LEGO1/lego/legoomni/include/legounknown100d5778.h index cb4dd25e..fe5df73f 100644 --- a/LEGO1/lego/legoomni/include/legounknown100d5778.h +++ b/LEGO1/lego/legoomni/include/legounknown100d5778.h @@ -3,10 +3,11 @@ #include "decomp.h" #include "mxtypes.h" -#include "roi/legoroi.h" #include +class LegoROI; + // VTABLE: LEGO1 0x100d5778 // SIZE 0x30 class LegoUnknown100d5778 { diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index e484c9a0..687d7d24 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -2,16 +2,13 @@ #define LEGOUTILS_H #include "extra.h" -#include "misc/legostorage.h" -#include "misc/legotexture.h" -#include "mxstring.h" #include "mxtypes.h" -#include "mxutilities.h" #include class MxAtomId; class LegoEntity; +class LegoFile; class LegoAnimPresenter; class LegoNamedTexture; class LegoTreeNode; diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h index 01ad45c9..eb7a0b90 100644 --- a/LEGO1/lego/legoomni/include/legovideomanager.h +++ b/LEGO1/lego/legoomni/include/legovideomanager.h @@ -1,16 +1,21 @@ #ifndef LEGOVIDEOMANAGER_H #define LEGOVIDEOMANAGER_H -#include "3dmanager/lego3dmanager.h" #include "decomp.h" #include "legophonemelist.h" -#include "mxdirectx/mxdirect3d.h" -#include "mxdirectx/mxstopwatch.h" #include "mxvideomanager.h" #include +class Lego3DManager; class LegoROI; +class MxDirect3D; +class MxStopWatch; + +namespace Tgl +{ +class Renderer; +} // VTABLE: LEGO1 0x100d9c88 // SIZE 0x590 diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h index f882b685..9f7dd7c1 100644 --- a/LEGO1/lego/legoomni/include/legoworld.h +++ b/LEGO1/lego/legoomni/include/legoworld.h @@ -2,15 +2,14 @@ #define LEGOWORLD_H #include "legocachesoundlist.h" -#include "legocachsound.h" -#include "legocameracontroller.h" #include "legoentity.h" #include "legoentitylist.h" #include "legopathcontrollerlist.h" -#include "mxpresenter.h" #include "mxpresenterlist.h" +#include "roi/legoroi.h" class IslePathActor; +class LegoCameraController; class LegoPathBoundary; class LegoHideAnimPresenter; diff --git a/LEGO1/lego/legoomni/include/misc.h b/LEGO1/lego/legoomni/include/misc.h index 2d809258..65606dfb 100644 --- a/LEGO1/lego/legoomni/include/misc.h +++ b/LEGO1/lego/legoomni/include/misc.h @@ -3,9 +3,6 @@ #include "compat.h" #include "decomp.h" -#include "legoinputmanager.h" -#include "legoomni.h" -#include "legovideomanager.h" // Long include path due to dependency of misc library on LegoOmni #include "lego/legoomni/include/actions/actionsfwd.h" #include "mxtypes.h" @@ -16,6 +13,7 @@ class LegoBuildingManager; class LegoCharacterManager; class LegoControlManager; class LegoGameState; +class LegoInputManager; class LegoNavController; class LegoOmni; class LegoPlantManager; diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h index 4b70e9e8..922ff625 100644 --- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h +++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h @@ -1,13 +1,12 @@ #ifndef MXBACKGROUNDAUDIOMANAGER_H #define MXBACKGROUNDAUDIOMANAGER_H -#include "mxaudiopresenter.h" #include "mxcore.h" #include "mxdsaction.h" -#include "mxnotificationmanager.h" -#include "mxpresenter.h" #include "mxtypes.h" +class MxAudioPresenter; + // VTABLE: LEGO1 0x100d9fe8 // SIZE 0x150 class MxBackgroundAudioManager : public MxCore { diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h index 5b4e4778..4ba7ac20 100644 --- a/LEGO1/lego/legoomni/include/police.h +++ b/LEGO1/lego/legoomni/include/police.h @@ -2,12 +2,13 @@ #define POLICE_H #include "decomp.h" -#include "legocontrolmanager.h" #include "legogamestate.h" #include "legoworld.h" -#include "mxdsaction.h" #include "radio.h" +class LegoControlManagerEvent; +class LegoEventNotificationParam; +class MxDSAction; class PoliceState; // VTABLE: LEGO1 0x100d8a80 diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h index 3f9a9bad..75970729 100644 --- a/LEGO1/lego/legoomni/include/policestate.h +++ b/LEGO1/lego/legoomni/include/policestate.h @@ -4,7 +4,6 @@ #include "actionsfwd.h" #include "decomp.h" #include "legostate.h" -#include "police.h" // VTABLE: LEGO1 0x100d8af0 // SIZE 0x10 diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h index 7e3cff87..3c35a300 100644 --- a/LEGO1/lego/legoomni/include/radio.h +++ b/LEGO1/lego/legoomni/include/radio.h @@ -1,10 +1,11 @@ #ifndef RADIO_H #define RADIO_H -#include "legocontrolmanager.h" -#include "mxactionnotificationparam.h" #include "mxcore.h" -#include "radiostate.h" + +class LegoControlManagerEvent; +class MxEndActionNotificationParam; +class RadioState; // VTABLE: LEGO1 0x100d6d10 // SIZE 0x10 diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h index b768da19..e0c0066c 100644 --- a/LEGO1/lego/legoomni/include/radiostate.h +++ b/LEGO1/lego/legoomni/include/radiostate.h @@ -2,7 +2,8 @@ #define RADIOSTATE_H #include "legostate.h" -#include "mxdsaction.h" + +class MxAtomId; // VTABLE: LEGO1 0x100d6d28 // SIZE 0x30 diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h index 9bb23115..1266d29b 100644 --- a/LEGO1/lego/legoomni/include/registrationbook.h +++ b/LEGO1/lego/legoomni/include/registrationbook.h @@ -1,14 +1,12 @@ #ifndef REGISTRATIONBOOK_H #define REGISTRATIONBOOK_H -#include "jukebox.h" -#include "legogamestate.h" #include "legoworld.h" -#include "mxcontrolpresenter.h" -#include "mxstillpresenter.h" class InfocenterState; +class MxControlPresenter; class MxEndActionNotificationParam; +class MxStillPresenter; class LegoControlManagerEvent; // VTABLE: LEGO1 0x100d9928 diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h index 9ee47851..71efd0f4 100644 --- a/LEGO1/lego/legoomni/include/score.h +++ b/LEGO1/lego/legoomni/include/score.h @@ -1,12 +1,12 @@ #ifndef SCORE_H #define SCORE_H -#include "legocontrolmanager.h" -#include "legoeventnotificationparam.h" #include "legogamestate.h" #include "legoworld.h" -#include "mxactionnotificationparam.h" -#include "scorestate.h" + +class LegoControlManagerEvent; +class MxEndActionNotificationParam; +class ScoreState; // VTABLE: LEGO1 0x100d4018 // SIZE 0x104 diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp index c3e53fde..98c167fe 100644 --- a/LEGO1/lego/legoomni/src/act1/act1state.cpp +++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp @@ -1,5 +1,6 @@ #include "act1state.h" +#include "legonamedtexture.h" #include "legoutils.h" DECOMP_SIZE_ASSERT(Act1State, 0x26c) diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 9c0f87e5..933f96f9 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -1,14 +1,17 @@ #include "ambulance.h" +#include "ambulancemissionstate.h" #include "decomp.h" #include "legocontrolmanager.h" #include "legogamestate.h" #include "legoomni.h" #include "legovariables.h" +#include "legoworld.h" #include "misc.h" #include "mxmisc.h" #include "mxticklemanager.h" #include "mxtimer.h" +#include "mxvariabletable.h" DECOMP_SIZE_ASSERT(Ambulance, 0x184) diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index 54064290..3158452c 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -3,11 +3,13 @@ #include "act1state.h" #include "act3.h" #include "act3_actions.h" +#include "helicopterstate.h" #include "isle.h" #include "isle_actions.h" #include "jukebox.h" #include "jukebox_actions.h" #include "legoanimationmanager.h" +#include "legocameracontroller.h" #include "legocontrolmanager.h" #include "legogamestate.h" #include "legoomni.h" diff --git a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp index 48d3e06f..607892bd 100644 --- a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp +++ b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp @@ -1,10 +1,14 @@ #include "islepathactor.h" +#include "3dmanager/lego3dmanager.h" #include "jukebox_actions.h" #include "legoanimationmanager.h" #include "legonavcontroller.h" +#include "legoomni.h" #include "legopathboundary.h" #include "legoutils.h" +#include "legovideomanager.h" +#include "legoworld.h" #include "misc.h" #include "mxnotificationparam.h" diff --git a/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp index 167fc4ce..a1f5c430 100644 --- a/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp +++ b/LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp @@ -12,6 +12,7 @@ #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxnotificationparam.h" #include "mxtransitionmanager.h" DECOMP_SIZE_ASSERT(JukeBoxEntity, 0x6c) diff --git a/LEGO1/lego/legoomni/src/actors/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp index 5aaea1ab..1d69d623 100644 --- a/LEGO1/lego/legoomni/src/actors/radio.cpp +++ b/LEGO1/lego/legoomni/src/actors/radio.cpp @@ -4,11 +4,14 @@ #include "legocontrolmanager.h" #include "legogamestate.h" #include "legoomni.h" +#include "legoworld.h" #include "misc.h" +#include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxcontrolpresenter.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "radiostate.h" DECOMP_SIZE_ASSERT(Radio, 0x10) diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp index 30f3f218..37016797 100644 --- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp +++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp @@ -6,6 +6,8 @@ #include "isle_actions.h" #include "jukebox_actions.h" #include "legoanimationmanager.h" +#include "legocontrolmanager.h" +#include "legoomni.h" #include "legoutils.h" #include "misc.h" #include "mxmisc.h" diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp index a30aa94a..59ca793b 100644 --- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp +++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp @@ -1,8 +1,10 @@ #include "legoloadcachesoundpresenter.h" +#include "legocachesoundmanager.h" #include "legocachsound.h" #include "legosoundmanager.h" #include "misc.h" +#include "mxdssubscriber.h" #include "mxstreamchunk.h" #include "mxwavepresenter.h" diff --git a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp index 0c077963..942f8040 100644 --- a/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp @@ -1,5 +1,6 @@ #include "legosoundmanager.h" +#include "legocachesoundmanager.h" #include "mxautolock.h" #include "mxomni.h" diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index 4a3a0eda..04d8cbc8 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -2,9 +2,11 @@ #include "legoomni.h" #include "misc.h" +#include "mxaudiopresenter.h" #include "mxcompositepresenter.h" #include "mxdssound.h" #include "mxmisc.h" +#include "mxnotificationmanager.h" #include "mxpresenter.h" #include "mxstreamer.h" #include "mxticklemanager.h" diff --git a/LEGO1/lego/legoomni/src/build/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp index 15a2fdfd..7986a589 100644 --- a/LEGO1/lego/legoomni/src/build/buildingentity.cpp +++ b/LEGO1/lego/legoomni/src/build/buildingentity.cpp @@ -2,6 +2,7 @@ #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxnotificationparam.h" DECOMP_SIZE_ASSERT(BuildingEntity, 0x68) diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp index 86972b68..c0e8d07a 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -5,10 +5,12 @@ #include "legoomni.h" #include "legoutils.h" #include "mxcompositepresenter.h" +#include "mxdssubscriber.h" #include "mxmediapresenter.h" #include "mxmisc.h" #include "mxstreamchunk.h" #include "mxticklemanager.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(LegoActionControlPresenter, 0x68) diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 01bdad5e..6160fd3b 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -1,19 +1,23 @@ #include "legoanimationmanager.h" +#include "animstate.h" #include "define.h" #include "islepathactor.h" #include "legocharactermanager.h" #include "legoendanimnotificationparam.h" +#include "legoextraactor.h" #include "legogamestate.h" #include "legoomni.h" #include "legoroilist.h" +#include "legovideomanager.h" +#include "legoworld.h" #include "misc.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" +#include "mxnotificationmanager.h" #include "mxticklemanager.h" #include "mxtimer.h" #include "mxutilities.h" -#include "roi/legoroi.h" #include diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp index d2b2632a..9ebaaa8a 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp @@ -1,5 +1,6 @@ #include "legoanimmmpresenter.h" +#include "3dmanager/lego3dmanager.h" #include "decomp.h" #include "define.h" #include "islepathactor.h" diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp index fa5795d7..c66dd269 100644 --- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp +++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp @@ -1,10 +1,13 @@ #include "legobackgroundcolor.h" +#include "3dmanager/lego3dmanager.h" #include "decomp.h" #include "legoutils.h" #include "legovideomanager.h" #include "misc.h" +#include + DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30) // GLOBAL: LEGO1 0x100f3fb0 diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp index 2d851715..d5ba428b 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -1,15 +1,20 @@ #include "legocharactermanager.h" +#include "3dmanager/lego3dmanager.h" #include "legoanimactor.h" #include "legocharacters.h" +#include "legoextraactor.h" #include "legogamestate.h" +#include "legovariables.h" #include "legovideomanager.h" #include "misc.h" #include "misc/legocontainer.h" +#include "misc/legostorage.h" #include "mxmisc.h" +#include "mxvariabletable.h" #include "realtime/realtime.h" #include "roi/legolod.h" -#include "roi/legoroi.h" +#include "viewmanager/viewmanager.h" #include diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index ef1a436e..3237e165 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -1,5 +1,6 @@ #include "legogamestate.h" +#include "3dmanager/lego3dmanager.h" #include "act1state.h" #include "act2main_actions.h" #include "act3_actions.h" @@ -28,8 +29,10 @@ #include "jukebox_actions.h" #include "jukeboxw_actions.h" #include "legoanimationmanager.h" +#include "legobackgroundcolor.h" #include "legobuildingmanager.h" #include "legocharactermanager.h" +#include "legofullscreenmovie.h" #include "legonavcontroller.h" #include "legoomni.h" #include "legoplantmanager.h" @@ -40,8 +43,11 @@ #include "misc.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" +#include "mxnotificationmanager.h" +#include "mxnotificationparam.h" #include "mxobjectfactory.h" #include "mxstring.h" +#include "mxutilities.h" #include "mxvariabletable.h" #include "police_actions.h" #include "racecar.h" diff --git a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp index 7463524c..520a0070 100644 --- a/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp +++ b/LEGO1/lego/legoomni/src/common/legotextureinfo.cpp @@ -4,6 +4,7 @@ #include "misc.h" #include "misc/legoimage.h" #include "misc/legotexture.h" +#include "mxdirectx/mxdirect3d.h" #include "tgl/d3drm/impl.h" DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10) diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index 3cf3e705..ae6e3d29 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -1,6 +1,8 @@ #include "legoutils.h" +#include "3dmanager/lego3dmanager.h" #include "act1state.h" +#include "anim/legoanim.h" #include "islepathactor.h" #include "legoanimpresenter.h" #include "legogamestate.h" @@ -8,14 +10,18 @@ #include "legonamedtexture.h" #include "legoomni.h" #include "legosoundmanager.h" +#include "legovideomanager.h" #include "legoworld.h" #include "legoworldlist.h" #include "misc.h" +#include "misc/legotree.h" #include "mxdsaction.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstreamer.h" #include "mxtypes.h" +#include "mxutilities.h" +#include "mxvariabletable.h" #include "realtime/realtime.h" #include diff --git a/LEGO1/lego/legoomni/src/common/legovariables.cpp b/LEGO1/lego/legoomni/src/common/legovariables.cpp index 71e6e587..993b0129 100644 --- a/LEGO1/lego/legoomni/src/common/legovariables.cpp +++ b/LEGO1/lego/legoomni/src/common/legovariables.cpp @@ -1,5 +1,6 @@ #include "legovariables.h" +#include "3dmanager/lego3dmanager.h" #include "legobuildingmanager.h" #include "legocharactermanager.h" #include "legogamestate.h" diff --git a/LEGO1/lego/legoomni/src/common/misc.cpp b/LEGO1/lego/legoomni/src/common/misc.cpp index fe4c6f7d..9f632bf8 100644 --- a/LEGO1/lego/legoomni/src/common/misc.cpp +++ b/LEGO1/lego/legoomni/src/common/misc.cpp @@ -1,7 +1,12 @@ #include "misc.h" +#include "3dmanager/lego3dmanager.h" +#include "legoinputmanager.h" +#include "legoomni.h" +#include "legovideomanager.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" +#include "roi/legoroi.h" // GLOBAL: LEGO1 0x100f4c58 MxBool g_isWorldActive = TRUE; diff --git a/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp index b7537d9e..90a37ef2 100644 --- a/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp @@ -6,6 +6,7 @@ #include "legoworld.h" #include "misc.h" #include "mxbackgroundaudiomanager.h" +#include "mxdisplaysurface.h" #include "mxmisc.h" #include "mxparam.h" #include "mxticklemanager.h" diff --git a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp index 8f88d5d5..a7ca2c20 100644 --- a/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp +++ b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp @@ -4,6 +4,7 @@ #include "legovideomanager.h" #include "misc.h" #include "mxcontrolpresenter.h" +#include "mxdsaction.h" #include "mxmisc.h" #include "mxpresenter.h" #include "mxticklemanager.h" diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp index 6e006a28..e94d02d8 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -2,6 +2,7 @@ #include "decomp.h" #include "mxbitmap.h" +#include "mxdsaction.h" #include "mxutilities.h" DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94) diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp index 6c27fd34..58df76c4 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp @@ -1,9 +1,11 @@ #include "legoactor.h" #include "define.h" +#include "legocachesoundmanager.h" #include "legosoundmanager.h" #include "misc.h" #include "mxutilities.h" +#include "roi/legoroi.h" DECOMP_SIZE_ASSERT(LegoActor, 0x78) diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp index 1076e787..6025f614 100644 --- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -1,5 +1,6 @@ #include "legocameracontroller.h" +#include "3dmanager/lego3dmanager.h" #include "legoinputmanager.h" #include "legonotify.h" #include "legosoundmanager.h" @@ -8,6 +9,7 @@ #include "mxmisc.h" #include "mxtimer.h" #include "realtime/realtime.h" +#include "roi/legoroi.h" #include diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index a55693f9..d1f145c2 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -1,8 +1,11 @@ #include "legoentity.h" +#include "3dmanager/lego3dmanager.h" #include "define.h" #include "legobuildingmanager.h" +#include "legocameracontroller.h" #include "legocharactermanager.h" +#include "legoeventnotificationparam.h" #include "legogamestate.h" #include "legoplantmanager.h" #include "legoutils.h" @@ -10,6 +13,7 @@ #include "legoworld.h" #include "misc.h" #include "mxmisc.h" +#include "mxutilities.h" #include "realtime/realtime.h" DECOMP_SIZE_ASSERT(LegoEntity, 0x68) diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp index 573d2392..b49c3438 100644 --- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp @@ -1,7 +1,9 @@ #include "legonavcontroller.h" +#include "3dmanager/lego3dmanager.h" #include "infocenterstate.h" #include "legoanimationmanager.h" +#include "legocameracontroller.h" #include "legocameralocations.h" #include "legogamestate.h" #include "legoinputmanager.h" @@ -9,12 +11,15 @@ #include "legosoundmanager.h" #include "legoutils.h" #include "legovideomanager.h" +#include "legoworld.h" #include "misc.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxtimer.h" #include "mxtransitionmanager.h" +#include "mxutilities.h" #include "realtime/realtime.h" +#include "realtime/realtimeview.h" #include diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 522c9918..c7d47303 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -1,9 +1,12 @@ #include "legoworld.h" +#include "anim/legoanim.h" #include "islepathactor.h" #include "legoanimationmanager.h" #include "legoanimpresenter.h" #include "legobuildingmanager.h" +#include "legocachesoundmanager.h" +#include "legocameracontroller.h" #include "legocontrolmanager.h" #include "legogamestate.h" #include "legoinputmanager.h" @@ -21,6 +24,8 @@ #include "mxnotificationmanager.h" #include "mxnotificationparam.h" #include "mxticklemanager.h" +#include "mxutilities.h" +#include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(LegoWorld, 0xf8) DECOMP_SIZE_ASSERT(LegoEntityList, 0x18) diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp index 2af1ddbb..a6159d62 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp @@ -2,6 +2,7 @@ #include "infocenter.h" #include "infomain_actions.h" +#include "mxstillpresenter.h" DECOMP_SIZE_ASSERT(InfocenterState, 0x94) diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp index 65bcc1b5..8d67c169 100644 --- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp +++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp @@ -1,8 +1,10 @@ #include "legoinputmanager.h" +#include "legocameracontroller.h" #include "legocontrolmanager.h" #include "legoomni.h" #include "legovideomanager.h" +#include "legoworld.h" #include "misc.h" #include "mxautolock.h" #include "roi/legoroi.h" diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index 73244b41..067b3b6b 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -1,5 +1,6 @@ #include "legoomni.h" +#include "3dmanager/lego3dmanager.h" #include "islepathactor.h" #include "legoanimationmanager.h" #include "legobuildingmanager.h" @@ -19,15 +20,19 @@ #include "mxactionnotificationparam.h" #include "mxautolock.h" #include "mxbackgroundaudiomanager.h" +#include "mxdisplaysurface.h" #include "mxdsfile.h" #include "mxmisc.h" +#include "mxnotificationmanager.h" #include "mxomnicreateflags.h" #include "mxomnicreateparam.h" #include "mxstreamer.h" #include "mxticklemanager.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" #include "viewmanager/viewmanager.h" +DECOMP_SIZE_ASSERT(LegoOmni, 0x140) DECOMP_SIZE_ASSERT(LegoOmni::ScriptContainer, 0x1c) DECOMP_SIZE_ASSERT(LegoWorldList, 0x18) DECOMP_SIZE_ASSERT(LegoWorldListCursor, 0x10) diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp index c94b498d..70c73fe2 100644 --- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp @@ -1,5 +1,6 @@ #include "legoanimactor.h" +#include "anim/legoanim.h" #include "define.h" #include "legolocomotionanimpresenter.h" #include "legopathboundary.h" diff --git a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp index 4402756d..9da6e219 100644 --- a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp @@ -1,8 +1,11 @@ #include "legoextraactor.h" +#include "anim/legoanim.h" +#include "legocachesoundmanager.h" #include "legolocomotionanimpresenter.h" #include "legopathboundary.h" #include "legosoundmanager.h" +#include "legoworld.h" #include "misc.h" #include "mxmisc.h" #include "mxtimer.h" diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp index 977624b5..400f165d 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp @@ -1,11 +1,16 @@ #include "legopathactor.h" +#include "geom/legounkown100db7f4.h" +#include "legocachesoundmanager.h" +#include "legocameracontroller.h" #include "legonavcontroller.h" #include "legopathboundary.h" #include "legosoundmanager.h" +#include "legoworld.h" #include "misc.h" #include "mxmisc.h" #include "mxtimer.h" +#include "mxvariabletable.h" #include diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index 9ff31ed4..7542192b 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -1,8 +1,11 @@ #include "legopathpresenter.h" +#include "legopathcontroller.h" #include "legovideomanager.h" +#include "legoworld.h" #include "misc.h" #include "mxautolock.h" +#include "mxdssubscriber.h" #include "mxutilities.h" DECOMP_SIZE_ASSERT(LegoPathPresenter, 0x54) diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index e8f887f6..32a8d26f 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -1,8 +1,11 @@ #include "legoanimpresenter.h" +#include "3dmanager/lego3dmanager.h" +#include "anim/legoanim.h" #include "define.h" #include "legoanimationmanager.h" #include "legoanimmmpresenter.h" +#include "legocameracontroller.h" #include "legocharactermanager.h" #include "legoendanimnotificationparam.h" #include "legopathboundary.h" @@ -12,13 +15,16 @@ #include "mxautolock.h" #include "mxcompositepresenter.h" #include "mxdsanim.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstreamchunk.h" #include "mxtimer.h" #include "mxutilities.h" +#include "mxvariabletable.h" #include "mxvideomanager.h" #include "realtime/realtime.h" +#include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(LegoAnimPresenter, 0xbc) diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 7417748f..974c2e16 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -1,5 +1,6 @@ #include "legomodelpresenter.h" +#include "3dmanager/lego3dmanager.h" #include "anim/legoanim.h" #include "define.h" #include "legocharactermanager.h" @@ -12,6 +13,8 @@ #include "misc/legotexture.h" #include "misc/version.h" #include "mxcompositepresenter.h" +#include "mxdirectx/mxdirect3d.h" +#include "mxdssubscriber.h" #include "mxutilities.h" #include "realtime/realtime.h" #include "roi/legoroi.h" diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp index f8322e93..880f1b9f 100644 --- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp @@ -3,6 +3,9 @@ #include "legovideomanager.h" #include "misc.h" #include "misc/legostorage.h" +#include "mxdsaction.h" +#include "mxdssubscriber.h" +#include "mxpalette.h" #include "mxstreamchunk.h" DECOMP_SIZE_ASSERT(LegoPalettePresenter, 0x68) diff --git a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp index 7aead0ed..87e15745 100644 --- a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp @@ -5,6 +5,9 @@ #include "misc/legocontainer.h" #include "misc/legostorage.h" #include "misc/legotexture.h" +#include "mxdirectx/mxdirect3d.h" +#include "mxdsaction.h" +#include "mxdssubscriber.h" #include "viewmanager/viewlodlist.h" DECOMP_SIZE_ASSERT(LegoLODList, 0x18) diff --git a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp index 5c0dd322..5fbbba21 100644 --- a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp @@ -1,9 +1,11 @@ #include "legophonemepresenter.h" #include "legocharactermanager.h" +#include "legovideomanager.h" #include "misc.h" #include "misc/legocontainer.h" #include "mxcompositepresenter.h" +#include "mxdsaction.h" DECOMP_SIZE_ASSERT(LegoPhonemePresenter, 0x88) diff --git a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp index e2d5211b..0c76b447 100644 --- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp @@ -6,6 +6,8 @@ #include "misc/legoimage.h" #include "misc/legostorage.h" #include "mxcompositepresenter.h" +#include "mxdirectx/mxdirect3d.h" +#include "mxdssubscriber.h" DECOMP_SIZE_ASSERT(LegoTexturePresenter, 0x54) DECOMP_SIZE_ASSERT(LegoNamedTexture, 0x14) diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp index e24de146..6e993d3a 100644 --- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -1,8 +1,15 @@ #include "legovideomanager.h" +#include "3dmanager/lego3dmanager.h" +#include "legoinputmanager.h" #include "legoomni.h" #include "misc.h" +#include "mxdirectx/mxdirect3d.h" +#include "mxdirectx/mxstopwatch.h" +#include "mxdisplaysurface.h" #include "mxmisc.h" +#include "mxpalette.h" +#include "mxregion.h" #include "mxtimer.h" #include "mxtransitionmanager.h" #include "realtime/matrix.h" diff --git a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp index 0222bd83..bbec9dd0 100644 --- a/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp +++ b/LEGO1/lego/legoomni/src/worlds/elevatorbottom.cpp @@ -13,6 +13,7 @@ #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" DECOMP_SIZE_ASSERT(ElevatorBottom, 0xfc) diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp index 9f4f870f..9da31f68 100644 --- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp +++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp @@ -1,6 +1,7 @@ #include "gasstation.h" #include "garage_actions.h" +#include "gasstationstate.h" #include "islepathactor.h" #include "jukebox.h" #include "jukebox_actions.h" @@ -12,6 +13,7 @@ #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxstillpresenter.h" #include "mxticklemanager.h" #include "mxtimer.h" #include "mxtransitionmanager.h" diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp index 9f99002b..7534623a 100644 --- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp @@ -7,6 +7,7 @@ #include "misc.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxstillpresenter.h" #include "mxtransitionmanager.h" DECOMP_SIZE_ASSERT(HistoryBook, 0x3e4) diff --git a/LEGO1/lego/legoomni/src/worlds/hospital.cpp b/LEGO1/lego/legoomni/src/worlds/hospital.cpp index 43b422dc..7666098b 100644 --- a/LEGO1/lego/legoomni/src/worlds/hospital.cpp +++ b/LEGO1/lego/legoomni/src/worlds/hospital.cpp @@ -2,6 +2,7 @@ #include "act1state.h" #include "hospital_actions.h" +#include "hospitalstate.h" #include "islepathactor.h" #include "jukebox.h" #include "jukebox_actions.h" @@ -10,9 +11,11 @@ #include "legoomni.h" #include "legoutils.h" #include "misc.h" +#include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxstillpresenter.h" #include "mxticklemanager.h" #include "mxtimer.h" #include "mxtransitionmanager.h" diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index bddef81b..1902a735 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -22,12 +22,16 @@ #include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxcontrolpresenter.h" +#include "mxdisplaysurface.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstillpresenter.h" #include "mxticklemanager.h" #include "mxtransitionmanager.h" +#include "mxutilities.h" +#include "radiostate.h" #include "sndanim_actions.h" +#include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(Infocenter, 0x1d8) DECOMP_SIZE_ASSERT(InfocenterMapEntry, 0x18) diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 0ab1797f..ce8f559d 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -1,5 +1,6 @@ #include "isle.h" +#include "3dmanager/lego3dmanager.h" #include "act1state.h" #include "ambulance.h" #include "bike.h" @@ -13,6 +14,7 @@ #include "jukebox_actions.h" #include "jukeboxentity.h" #include "legoanimationmanager.h" +#include "legobackgroundcolor.h" #include "legocontrolmanager.h" #include "legoinputmanager.h" #include "legoomni.h" @@ -21,11 +23,13 @@ #include "legovideomanager.h" #include "misc.h" #include "motocycle.h" +#include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstillpresenter.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" #include "pizza.h" #include "skateboard.h" #include "towtrack.h" diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp index e73c1384..9080e4c1 100644 --- a/LEGO1/lego/legoomni/src/worlds/police.cpp +++ b/LEGO1/lego/legoomni/src/worlds/police.cpp @@ -7,6 +7,7 @@ #include "legoinputmanager.h" #include "legoomni.h" #include "misc.h" +#include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index 549fc89a..b4cdd0a4 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -9,9 +9,11 @@ #include "misc.h" #include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" +#include "mxcontrolpresenter.h" #include "mxdisplaysurface.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxstillpresenter.h" #include "mxtimer.h" #include "mxtransitionmanager.h" #include "regbook_actions.h" diff --git a/LEGO1/lego/legoomni/src/worlds/score.cpp b/LEGO1/lego/legoomni/src/worlds/score.cpp index 868241d6..33814313 100644 --- a/LEGO1/lego/legoomni/src/worlds/score.cpp +++ b/LEGO1/lego/legoomni/src/worlds/score.cpp @@ -12,12 +12,14 @@ #include "legoomni.h" #include "misc.h" #include "misc/legocontainer.h" +#include "mxactionnotificationparam.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxnotificationparam.h" #include "mxtransitionmanager.h" #include "pizzamissionstate.h" #include "racestate.h" +#include "scorestate.h" #include "towtrackmissionstate.h" DECOMP_SIZE_ASSERT(Score, 0x104) diff --git a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp index f58a519a..1781870a 100644 --- a/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp +++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp @@ -4,6 +4,7 @@ #include "decomp.h" #include "viewmanager/viewlodlist.h" +#include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(Lego3DManager, 0x10); diff --git a/LEGO1/lego/sources/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h index 74a9eb1c..6c8930e9 100644 --- a/LEGO1/lego/sources/3dmanager/lego3dview.h +++ b/LEGO1/lego/sources/3dmanager/lego3dview.h @@ -3,7 +3,9 @@ #include "decomp.h" #include "legoview1.h" -#include "viewmanager/viewmanager.h" + +class ViewManager; +class ViewROI; ///////////////////////////////////////////////////////////////////////////// // Lego3DView diff --git a/LEGO1/lego/sources/anim/legoanim.h b/LEGO1/lego/sources/anim/legoanim.h index 7ba9cc04..9dd23a55 100644 --- a/LEGO1/lego/sources/anim/legoanim.h +++ b/LEGO1/lego/sources/anim/legoanim.h @@ -4,7 +4,8 @@ #include "decomp.h" #include "misc/legostorage.h" #include "misc/legotree.h" -#include "realtime/matrix.h" + +class Matrix4; // SIZE 0x08 class LegoAnimKey { diff --git a/LEGO1/lego/sources/geom/legoedge.h b/LEGO1/lego/sources/geom/legoedge.h index a3b71b64..da440e71 100644 --- a/LEGO1/lego/sources/geom/legoedge.h +++ b/LEGO1/lego/sources/geom/legoedge.h @@ -2,9 +2,9 @@ #define __LEGOEDGE_H #include "misc/legotypes.h" -#include "realtime/vector.h" class LegoWEEdge; +class Vector3; // VTABLE: LEGO1 0x100db7b8 // SIZE 0x24 diff --git a/LEGO1/lego/sources/misc/legocontainer.cpp b/LEGO1/lego/sources/misc/legocontainer.cpp index dddb979a..d9bdc0eb 100644 --- a/LEGO1/lego/sources/misc/legocontainer.cpp +++ b/LEGO1/lego/sources/misc/legocontainer.cpp @@ -2,6 +2,7 @@ #include "lego/legoomni/include/legovideomanager.h" #include "lego/legoomni/include/misc.h" +#include "mxdirectx/mxdirect3d.h" #include "tgl/d3drm/impl.h" DECOMP_SIZE_ASSERT(LegoContainerInfo, 0x10); diff --git a/LEGO1/lego/sources/misc/legounknown.h b/LEGO1/lego/sources/misc/legounknown.h index 8980d96a..03eafcee 100644 --- a/LEGO1/lego/sources/misc/legounknown.h +++ b/LEGO1/lego/sources/misc/legounknown.h @@ -3,7 +3,8 @@ #include "legotypes.h" #include "mxgeometry/mxgeometry3d.h" -#include "mxgeometry/mxmatrix.h" + +class Matrix4; // SIZE 0x50 class LegoUnknown { diff --git a/LEGO1/omni/include/mxatom.h b/LEGO1/omni/include/mxatom.h index 9528a3c6..ae3dbba3 100644 --- a/LEGO1/omni/include/mxatom.h +++ b/LEGO1/omni/include/mxatom.h @@ -35,8 +35,8 @@ class MxAtom { // MxAtom::`scalar deleting destructor' private: - MxString m_key; - MxU16 m_value; + MxString m_key; // 0x00 + MxU16 m_value; // 0x10 }; struct MxAtomCompare { diff --git a/LEGO1/omni/include/mxautolock.h b/LEGO1/omni/include/mxautolock.h index 1488cd4e..677804e7 100644 --- a/LEGO1/omni/include/mxautolock.h +++ b/LEGO1/omni/include/mxautolock.h @@ -1,7 +1,7 @@ #ifndef MXAUTOLOCK_H #define MXAUTOLOCK_H -#include "mxcriticalsection.h" +class MxCriticalSection; #define AUTOLOCK(CS) MxAutoLock lock(&CS) diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h index 8f06abf0..a11853e4 100644 --- a/LEGO1/omni/include/mxbitmap.h +++ b/LEGO1/omni/include/mxbitmap.h @@ -2,11 +2,13 @@ #define MXBITMAP_H #include "mxcore.h" -#include "mxpalette.h" #include "mxtypes.h" +#include #include +class MxPalette; + // The stock BITMAPINFO struct from wingdi.h only makes room for one color // in the palette. It seems like the expectation (if you use the struct) // is to malloc as much as you actually need, and then index into the array diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h index 2e5a6d95..977c1325 100644 --- a/LEGO1/omni/include/mxcompositepresenter.h +++ b/LEGO1/omni/include/mxcompositepresenter.h @@ -1,10 +1,12 @@ #ifndef MXCOMPOSITEPRESENTER_H #define MXCOMPOSITEPRESENTER_H -#include "mxactionnotificationparam.h" #include "mxpresenter.h" #include "mxstl/stlcompat.h" +class MxEndActionNotificationParam; +class MxNotificationParam; + class MxCompositePresenterList : public list {}; // VTABLE: LEGO1 0x100dc618 diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h index ab13c73d..b7312833 100644 --- a/LEGO1/omni/include/mxdiskstreamcontroller.h +++ b/LEGO1/omni/include/mxdiskstreamcontroller.h @@ -3,13 +3,14 @@ #include "decomp.h" #include "mxdsbuffer.h" -#include "mxdsstreamingaction.h" #include "mxstl/stlcompat.h" #include "mxstreamcontroller.h" #include "mxtypes.h" #include +class MxDSStreamingAction; + // VTABLE: LEGO1 0x100dccb8 // SIZE 0xc8 class MxDiskStreamController : public MxStreamController { diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h index f440a8a9..2ec14784 100644 --- a/LEGO1/omni/include/mxdisplaysurface.h +++ b/LEGO1/omni/include/mxdisplaysurface.h @@ -2,13 +2,14 @@ #define MXDISPLAYSURFACE_H #include "decomp.h" -#include "mxbitmap.h" #include "mxcore.h" -#include "mxpalette.h" #include "mxvideoparam.h" #include +class MxBitmap; +class MxPalette; + // VTABLE: LEGO1 0x100dc768 // SIZE 0xac class MxDisplaySurface : public MxCore { diff --git a/LEGO1/omni/include/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h index 6c8b8024..989508e6 100644 --- a/LEGO1/omni/include/mxdsactionlist.h +++ b/LEGO1/omni/include/mxdsactionlist.h @@ -2,10 +2,9 @@ #define MXDSACTIONLIST_H #include "decomp.h" +#include "mxdsaction.h" #include "mxlist.h" -class MxDSAction; - // VTABLE: LEGO1 0x100dcea8 // class MxCollection @@ -31,7 +30,7 @@ class MxDSActionList : public MxList { // MxDSActionList::`scalar deleting destructor' private: - undefined m_unk0x18; + undefined m_unk0x18; // 0x18 }; // VTABLE: LEGO1 0x100d7e68 diff --git a/LEGO1/omni/include/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h index 1fb95cc0..e875f40b 100644 --- a/LEGO1/omni/include/mxdsmediaaction.h +++ b/LEGO1/omni/include/mxdsmediaaction.h @@ -3,7 +3,6 @@ #include "decomp.h" #include "mxdsaction.h" -#include "mxpoint32.h" // VTABLE: LEGO1 0x100dcd40 // SIZE 0xb8 diff --git a/LEGO1/omni/include/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h index 54cd203d..6d420c35 100644 --- a/LEGO1/omni/include/mxdssubscriber.h +++ b/LEGO1/omni/include/mxdssubscriber.h @@ -3,8 +3,6 @@ #include "decomp.h" #include "mxcore.h" -#include "mxdschunk.h" -#include "mxstreamchunk.h" #include "mxstreamchunklist.h" class MxStreamController; diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h index 77720bf3..5fd2390c 100644 --- a/LEGO1/omni/include/mxmediamanager.h +++ b/LEGO1/omni/include/mxmediamanager.h @@ -4,9 +4,10 @@ #include "mxcore.h" #include "mxcriticalsection.h" #include "mxpresenterlist.h" -#include "mxthread.h" #include "mxtypes.h" +class MxThread; + // VTABLE: LEGO1 0x100dc6b0 // SIZE 0x2c class MxMediaManager : public MxCore { diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h index 7eef4ff6..e78ac194 100644 --- a/LEGO1/omni/include/mxmediapresenter.h +++ b/LEGO1/omni/include/mxmediapresenter.h @@ -2,10 +2,11 @@ #define MXMEDIAPRESENTER_H #include "decomp.h" -#include "mxdssubscriber.h" #include "mxpresenter.h" #include "mxstreamchunklist.h" +class MxDSSubscriber; + // VTABLE: LEGO1 0x100d4cd8 // SIZE 0x50 class MxMediaPresenter : public MxPresenter { diff --git a/LEGO1/omni/include/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h index 3dabbc0e..adab6fe2 100644 --- a/LEGO1/omni/include/mxmidipresenter.h +++ b/LEGO1/omni/include/mxmidipresenter.h @@ -2,7 +2,8 @@ #define MXMIDIPRESENTER_H #include "mxmusicpresenter.h" -#include "mxstreamchunk.h" + +class MxStreamChunk; // VTABLE: LEGO1 0x100dca20 // SIZE 0x58 @@ -41,7 +42,7 @@ class MxMIDIPresenter : public MxMusicPresenter { void Destroy(MxBool p_fromDestructor); protected: - MxStreamChunk* m_chunk; + MxStreamChunk* m_chunk; // 0x54 }; #endif // MXMIDIPRESENTER_H diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h index 69ad1b18..e99f0923 100644 --- a/LEGO1/omni/include/mxnotificationmanager.h +++ b/LEGO1/omni/include/mxnotificationmanager.h @@ -3,10 +3,11 @@ #include "mxcore.h" #include "mxcriticalsection.h" -#include "mxnotificationparam.h" #include "mxstl/stlcompat.h" #include "mxtypes.h" +class MxNotificationParam; + class MxNotification { public: MxNotification(MxCore* p_target, const MxNotificationParam& p_param); diff --git a/LEGO1/omni/include/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h index 62e795fa..561af2a1 100644 --- a/LEGO1/omni/include/mxomnicreateflags.h +++ b/LEGO1/omni/include/mxomnicreateflags.h @@ -3,6 +3,7 @@ #include "mxtypes.h" +// SIZE 0x02 class MxOmniCreateFlags { public: MxOmniCreateFlags(); diff --git a/LEGO1/omni/include/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h index 5bc87dbb..338767bb 100644 --- a/LEGO1/omni/include/mxomnicreateparam.h +++ b/LEGO1/omni/include/mxomnicreateparam.h @@ -32,10 +32,10 @@ class MxOmniCreateParam : public MxParam { // MxOmniCreateParam::`scalar deleting destructor' private: - MxString m_mediaPath; - HWND m_windowHandle; - MxVideoParam m_videoParam; - MxOmniCreateFlags m_createFlags; + MxString m_mediaPath; // 0x04 + HWND m_windowHandle; // 0x14 + MxVideoParam m_videoParam; // 0x18 + MxOmniCreateFlags m_createFlags; // 0x3c }; // SYNTHETIC: ISLE 0x4014b0 diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h index dae4e0ad..a652f40d 100644 --- a/LEGO1/omni/include/mxpresenter.h +++ b/LEGO1/omni/include/mxpresenter.h @@ -4,10 +4,11 @@ #include "decomp.h" #include "mxcore.h" #include "mxcriticalsection.h" -#include "mxdsaction.h" #include "mxpoint32.h" class MxCompositePresenter; +class MxDSAction; +class MxOmni; class MxStreamController; class MxEntity; @@ -107,7 +108,7 @@ class MxPresenter : public MxCore { virtual void Enable(MxBool p_enable); // vtable+0x54 MxEntity* CreateEntity(const char* p_defaultName); - void SendToCompositePresenter(MxOmni*); + void SendToCompositePresenter(MxOmni* p_omni); MxBool IsEnabled(); inline MxS32 GetCurrentTickleState() const { return this->m_currentTickleState; } diff --git a/LEGO1/omni/include/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h index 820fc3f7..b445e8cd 100644 --- a/LEGO1/omni/include/mxramstreamcontroller.h +++ b/LEGO1/omni/include/mxramstreamcontroller.h @@ -2,9 +2,10 @@ #define MXRAMSTREAMCONTROLLER_H #include "mxdsbuffer.h" -#include "mxdsstreamingaction.h" #include "mxstreamcontroller.h" +class MxDSStreamingAction; + // VTABLE: LEGO1 0x100dc728 // SIZE 0x98 class MxRAMStreamController : public MxStreamController { diff --git a/LEGO1/omni/include/mxsmack.h b/LEGO1/omni/include/mxsmack.h index 227dbd6d..e7fdf3ce 100644 --- a/LEGO1/omni/include/mxsmack.h +++ b/LEGO1/omni/include/mxsmack.h @@ -2,12 +2,13 @@ #define MXSMACK_H #include "decomp.h" -#include "mxbitmap.h" #include "mxrectlist.h" #include "mxtypes.h" #include +struct MxBITMAPINFO; + // These functions are not part of the public interface, // but present in SMACK.LIB and used directly by Mindscape. extern "C" diff --git a/LEGO1/omni/include/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h index 00e242d0..80c33c8a 100644 --- a/LEGO1/omni/include/mxstreamchunk.h +++ b/LEGO1/omni/include/mxstreamchunk.h @@ -2,7 +2,6 @@ #define MXSTREAMCHUNK_H #include "mxdschunk.h" -#include "mxdsobject.h" class MxDSBuffer; class MxStreamListMxDSSubscriber; diff --git a/LEGO1/omni/include/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h index 4ae8fabe..105ff93b 100644 --- a/LEGO1/omni/include/mxstreamchunklist.h +++ b/LEGO1/omni/include/mxstreamchunklist.h @@ -3,8 +3,7 @@ #include "decomp.h" #include "mxlist.h" - -class MxStreamChunk; +#include "mxstreamchunk.h" // VTABLE: LEGO1 0x100dc5d0 // class MxCollection diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h index b623d28f..8948edf4 100644 --- a/LEGO1/omni/include/mxstreamcontroller.h +++ b/LEGO1/omni/include/mxstreamcontroller.h @@ -5,14 +5,12 @@ #include "mxatom.h" #include "mxcore.h" #include "mxcriticalsection.h" -#include "mxdsaction.h" -#include "mxdsobject.h" #include "mxdssubscriber.h" #include "mxstl/stlcompat.h" #include "mxstreamlist.h" -#include "mxstreamprovider.h" class MxDSStreamingAction; +class MxStreamProvider; // VTABLE: LEGO1 0x100dc968 // SIZE 0x64 diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h index 6ed47802..95c53fee 100644 --- a/LEGO1/omni/include/mxstreamer.h +++ b/LEGO1/omni/include/mxstreamer.h @@ -3,19 +3,21 @@ #include "decomp.h" #include "mxcore.h" -#include "mxdsobject.h" #include "mxmemorypool.h" #include "mxnotificationparam.h" +#include "mxstl/stlcompat.h" #include "mxstreamcontroller.h" #include "mxtypes.h" #include -#include + +class MxDSObject; typedef MxMemoryPool<64, 22> MxMemoryPool64; typedef MxMemoryPool<128, 2> MxMemoryPool128; // VTABLE: LEGO1 0x100dc760 +// SIZE 0x10 class MxStreamerNotification : public MxNotificationParam { public: inline MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr) @@ -29,7 +31,7 @@ class MxStreamerNotification : public MxNotificationParam { MxStreamController* GetController() { return m_controller; } private: - MxStreamController* m_controller; + MxStreamController* m_controller; // 0x0c }; // VTABLE: LEGO1 0x100dc710 diff --git a/LEGO1/omni/include/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h index 1082fffe..19f455e8 100644 --- a/LEGO1/omni/include/mxstreamprovider.h +++ b/LEGO1/omni/include/mxstreamprovider.h @@ -3,10 +3,10 @@ #include "decomp.h" #include "mxcore.h" -#include "mxdsfile.h" class MxStreamController; class MxDSAction; +class MxDSFile; // VTABLE: LEGO1 0x100dd100 // SIZE 0x10 diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h index 6ad125de..7f1e8c33 100644 --- a/LEGO1/omni/include/mxvariable.h +++ b/LEGO1/omni/include/mxvariable.h @@ -10,6 +10,7 @@ class MxVariable { public: MxVariable() {} + // FUNCTION: BETA10 0x1012a840 MxVariable(const char* p_key, const char* p_value) { @@ -17,6 +18,7 @@ class MxVariable { m_key.ToUpperCase(); m_value = p_value; } + // FUNCTION: BETA10 0x1012aa30 MxVariable(const char* p_key) { diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h index a915f5f5..02c16b61 100644 --- a/LEGO1/omni/include/mxvideomanager.h +++ b/LEGO1/omni/include/mxvideomanager.h @@ -1,14 +1,15 @@ #ifndef MXVIDEOMANAGER_H #define MXVIDEOMANAGER_H -#include "mxdisplaysurface.h" #include "mxmediamanager.h" -#include "mxrect32.h" -#include "mxregion.h" #include "mxvideoparam.h" #include +class MxDisplaySurface; +class MxRect32; +class MxRegion; + // VTABLE: LEGO1 0x100dc810 // SIZE 0x64 class MxVideoManager : public MxMediaManager { diff --git a/LEGO1/omni/include/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h index b9ae10ba..f9766b97 100644 --- a/LEGO1/omni/include/mxvideoparam.h +++ b/LEGO1/omni/include/mxvideoparam.h @@ -2,14 +2,14 @@ #define MXVIDEOPARAM_H #include "compat.h" -#include "mxpalette.h" #include "mxrect32.h" #include "mxtypes.h" -#include "mxvariabletable.h" #include "mxvideoparamflags.h" #include +class MxPalette; + // SIZE 0x24 class MxVideoParam { public: diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h index 5beac120..19a40e39 100644 --- a/LEGO1/omni/include/mxvideopresenter.h +++ b/LEGO1/omni/include/mxvideopresenter.h @@ -6,6 +6,8 @@ #include "mxmediapresenter.h" #include "mxrect32.h" +#include + // VTABLE: LEGO1 0x100d4be8 // SIZE 0x64 class MxVideoPresenter : public MxMediaPresenter { diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp index 205b760d..d3c990c5 100644 --- a/LEGO1/omni/src/audio/mxmidipresenter.cpp +++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp @@ -3,6 +3,7 @@ #include "decomp.h" #include "mxautolock.h" #include "mxdssound.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxmusicmanager.h" diff --git a/LEGO1/omni/src/audio/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp index 59c8f841..fa8bdcbe 100644 --- a/LEGO1/omni/src/audio/mxmusicmanager.cpp +++ b/LEGO1/omni/src/audio/mxmusicmanager.cpp @@ -1,6 +1,7 @@ #include "mxmusicmanager.h" #include "mxmisc.h" +#include "mxthread.h" #include "mxticklemanager.h" #include diff --git a/LEGO1/omni/src/audio/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp index 583d1dfc..33dd2bad 100644 --- a/LEGO1/omni/src/audio/mxsoundmanager.cpp +++ b/LEGO1/omni/src/audio/mxsoundmanager.cpp @@ -1,9 +1,11 @@ #include "mxsoundmanager.h" #include "mxautolock.h" +#include "mxdsaction.h" #include "mxmisc.h" #include "mxomni.h" #include "mxpresenter.h" +#include "mxthread.h" #include "mxticklemanager.h" #include "mxwavepresenter.h" diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index defb20f6..de113a7a 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -4,6 +4,7 @@ #include "define.h" #include "mxautolock.h" #include "mxdssound.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxomni.h" #include "mxsoundmanager.h" diff --git a/LEGO1/omni/src/common/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp index 7a5262b9..a88279ac 100644 --- a/LEGO1/omni/src/common/mxcompositepresenter.cpp +++ b/LEGO1/omni/src/common/mxcompositepresenter.cpp @@ -1,6 +1,7 @@ #include "mxcompositepresenter.h" #include "decomp.h" +#include "mxactionnotificationparam.h" #include "mxautolock.h" #include "mxdsmultiaction.h" #include "mxmisc.h" diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp index b735550b..4a322b33 100644 --- a/LEGO1/omni/src/common/mxmediapresenter.cpp +++ b/LEGO1/omni/src/common/mxmediapresenter.cpp @@ -3,6 +3,7 @@ #include "mxactionnotificationparam.h" #include "mxautolock.h" #include "mxcompositepresenter.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstreamchunk.h" diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp index 70a3c6af..05c94de0 100644 --- a/LEGO1/omni/src/event/mxeventpresenter.cpp +++ b/LEGO1/omni/src/event/mxeventpresenter.cpp @@ -2,6 +2,8 @@ #include "decomp.h" #include "mxautolock.h" +#include "mxdsaction.h" +#include "mxdssubscriber.h" #include "mxeventmanager.h" #include "mxmisc.h" #include "mxvariabletable.h" diff --git a/LEGO1/omni/src/main/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp index 099b41cc..c6c83733 100644 --- a/LEGO1/omni/src/main/mxomni.cpp +++ b/LEGO1/omni/src/main/mxomni.cpp @@ -15,6 +15,7 @@ #include "mxstreamer.h" #include "mxticklemanager.h" #include "mxtimer.h" +#include "mxvariabletable.h" #include "mxvideomanager.h" // GLOBAL: LEGO1 0x101015b8 diff --git a/LEGO1/omni/src/main/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp index 19a87055..916c7bcd 100644 --- a/LEGO1/omni/src/main/mxomnicreateflags.cpp +++ b/LEGO1/omni/src/main/mxomnicreateflags.cpp @@ -1,5 +1,9 @@ #include "mxomnicreateflags.h" +#include "decomp.h" + +DECOMP_SIZE_ASSERT(MxOmniCreateFlags, 0x02) + // FUNCTION: LEGO1 0x100b0a30 // FUNCTION: BETA10 0x10130a1c MxOmniCreateFlags::MxOmniCreateFlags() diff --git a/LEGO1/omni/src/main/mxomnicreateparam.cpp b/LEGO1/omni/src/main/mxomnicreateparam.cpp index 2393ea05..7f84fbc1 100644 --- a/LEGO1/omni/src/main/mxomnicreateparam.cpp +++ b/LEGO1/omni/src/main/mxomnicreateparam.cpp @@ -1,5 +1,9 @@ #include "mxomnicreateparam.h" +#include "decomp.h" + +DECOMP_SIZE_ASSERT(MxOmniCreateParam, 0x40) + // FUNCTION: LEGO1 0x100b0b00 // FUNCTION: BETA10 0x10130b6b MxOmniCreateParam::MxOmniCreateParam( diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp index 48c478cd..f9c00c3c 100644 --- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp +++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp @@ -4,6 +4,7 @@ #include "decomp.h" #include "mxautolock.h" #include "mxmisc.h" +#include "mxnotificationparam.h" #include "mxparam.h" #include "mxticklemanager.h" #include "mxtypes.h" diff --git a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp index d316912d..d6b73a9b 100644 --- a/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp +++ b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp @@ -3,6 +3,7 @@ #include "mxautolock.h" #include "mxdiskstreamcontroller.h" #include "mxdsbuffer.h" +#include "mxdsfile.h" #include "mxdsstreamingaction.h" #include "mxomni.h" #include "mxramstreamprovider.h" diff --git a/LEGO1/omni/src/stream/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp index bc40f71c..450673f7 100644 --- a/LEGO1/omni/src/stream/mxdsbuffer.cpp +++ b/LEGO1/omni/src/stream/mxdsbuffer.cpp @@ -8,6 +8,7 @@ #include "mxstreamchunk.h" #include "mxstreamcontroller.h" #include "mxstreamer.h" +#include "mxstreamprovider.h" DECOMP_SIZE_ASSERT(MxDSBuffer, 0x34); diff --git a/LEGO1/omni/src/stream/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp index d0915810..ec06f90b 100644 --- a/LEGO1/omni/src/stream/mxramstreamprovider.cpp +++ b/LEGO1/omni/src/stream/mxramstreamprovider.cpp @@ -2,6 +2,7 @@ #include "decomp.h" #include "mxdsbuffer.h" +#include "mxdsfile.h" #include "mxomni.h" #include "mxstreamcontroller.h" diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index a94cd974..4b76abf2 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -7,6 +7,7 @@ #include "mxnextactiondatastart.h" #include "mxstl/stlcompat.h" #include "mxstreamchunk.h" +#include "mxstreamprovider.h" #include "mxtimer.h" #include "mxutilities.h" diff --git a/LEGO1/omni/src/system/mxautolock.cpp b/LEGO1/omni/src/system/mxautolock.cpp index 56a5a977..a67c382c 100644 --- a/LEGO1/omni/src/system/mxautolock.cpp +++ b/LEGO1/omni/src/system/mxautolock.cpp @@ -1,5 +1,7 @@ #include "mxautolock.h" +#include "mxcriticalsection.h" + // FUNCTION: LEGO1 0x100b8ed0 MxAutoLock::MxAutoLock(MxCriticalSection* p_criticalSection) { diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp index 5cbbe8ee..29733d5f 100644 --- a/LEGO1/omni/src/video/mxbitmap.cpp +++ b/LEGO1/omni/src/video/mxbitmap.cpp @@ -1,6 +1,7 @@ #include "mxbitmap.h" #include "decomp.h" +#include "mxpalette.h" #include "mxutilities.h" DECOMP_SIZE_ASSERT(MxBitmap, 0x20); diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index e9a61549..6f3fbe0e 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -1,7 +1,9 @@ #include "mxdisplaysurface.h" +#include "mxbitmap.h" #include "mxmisc.h" #include "mxomni.h" +#include "mxpalette.h" #include "mxutilities.h" #include "mxvideomanager.h" diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp index 31279ca3..b8d98dfb 100644 --- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp +++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp @@ -1,6 +1,8 @@ #include "mxloopingflcpresenter.h" #include "decomp.h" +#include "mxdsaction.h" +#include "mxdssubscriber.h" DECOMP_SIZE_ASSERT(MxLoopingFlcPresenter, 0x6c); diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp index 384e645b..499fb075 100644 --- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp +++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp @@ -2,6 +2,7 @@ #include "mxautolock.h" #include "mxdsmediaaction.h" +#include "mxdssubscriber.h" DECOMP_SIZE_ASSERT(MxLoopingSmkPresenter, 0x724); diff --git a/LEGO1/omni/src/video/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp index 8d1835fe..fd08e8a9 100644 --- a/LEGO1/omni/src/video/mxsmack.cpp +++ b/LEGO1/omni/src/video/mxsmack.cpp @@ -1,5 +1,7 @@ #include "mxsmack.h" +#include "mxbitmap.h" + #include DECOMP_SIZE_ASSERT(SmackTag, 0x390); diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp index a507eb15..1ac6bd1e 100644 --- a/LEGO1/omni/src/video/mxsmkpresenter.cpp +++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp @@ -3,6 +3,7 @@ #include "decomp.h" #include "mxdsmediaaction.h" #include "mxmisc.h" +#include "mxpalette.h" #include "mxvideomanager.h" DECOMP_SIZE_ASSERT(MxSmkPresenter, 0x720); diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index b64f7490..f2c8ba6e 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -3,9 +3,12 @@ #include "decomp.h" #include "define.h" #include "mxcompositepresenter.h" +#include "mxdisplaysurface.h" #include "mxdsmediaaction.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxomni.h" +#include "mxpalette.h" #include "mxutilities.h" #include "mxvideomanager.h" diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp index 14b99a7e..f3bf04fd 100644 --- a/LEGO1/omni/src/video/mxvideomanager.cpp +++ b/LEGO1/omni/src/video/mxvideomanager.cpp @@ -1,9 +1,13 @@ #include "mxvideomanager.h" #include "mxautolock.h" +#include "mxdisplaysurface.h" #include "mxmisc.h" #include "mxomni.h" +#include "mxpalette.h" #include "mxpresenter.h" +#include "mxregion.h" +#include "mxthread.h" #include "mxticklemanager.h" DECOMP_SIZE_ASSERT(MxVideoManager, 0x64) diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp index 71d115d4..02adeb01 100644 --- a/LEGO1/omni/src/video/mxvideopresenter.cpp +++ b/LEGO1/omni/src/video/mxvideopresenter.cpp @@ -1,7 +1,9 @@ #include "mxvideopresenter.h" #include "mxautolock.h" +#include "mxdisplaysurface.h" #include "mxdsmediaaction.h" +#include "mxdssubscriber.h" #include "mxmisc.h" #include "mxregioncursor.h" #include "mxvideomanager.h"