From 0593c4fd77f0adbf7adc6fbfd25c3099d5af84ee Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 3 May 2024 11:58:54 -0400 Subject: [PATCH] Add more forward declarations --- ISLE/isleapp.cpp | 1 + LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h | 1 + LEGO1/lego/legoomni/include/legoanimpresenter.h | 1 + LEGO1/lego/legoomni/include/legoentitypresenter.h | 1 + LEGO1/lego/legoomni/include/legometerpresenter.h | 1 + LEGO1/lego/legoomni/include/legopathpresenter.h | 1 + LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp | 1 + LEGO1/lego/legoomni/src/actors/radio.cpp | 1 + .../legoomni/src/audio/legoloadcachesoundpresenter.cpp | 1 + LEGO1/lego/legoomni/src/build/buildingentity.cpp | 1 + .../legoomni/src/common/legoactioncontrolpresenter.cpp | 1 + LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp | 2 ++ LEGO1/lego/legoomni/src/common/legocharactermanager.cpp | 1 + LEGO1/lego/legoomni/src/common/legogamestate.cpp | 1 + LEGO1/lego/legoomni/src/common/legoutils.cpp | 1 + LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp | 1 + LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp | 1 + LEGO1/lego/legoomni/src/control/legometerpresenter.cpp | 1 + LEGO1/lego/legoomni/src/main/legoomni.cpp | 2 ++ LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp | 1 + LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp | 2 ++ LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 1 + LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp | 3 +++ LEGO1/lego/legoomni/src/video/legopartpresenter.cpp | 2 ++ LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp | 1 + LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp | 1 + LEGO1/lego/legoomni/src/video/legovideomanager.cpp | 3 +++ LEGO1/lego/legoomni/src/worlds/infocenter.cpp | 1 + LEGO1/lego/legoomni/src/worlds/isle.cpp | 1 + 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 ++ 81 files changed, 135 insertions(+), 42 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 165ea3c5..bb017de3 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -22,6 +22,7 @@ #include "mxticklemanager.h" #include "mxtimer.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" #include "res/resource.h" #include "roi/legoroi.h" #include "viewmanager/viewmanager.h" diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h index 6031a328..98ee03f2 100644 --- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h +++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h @@ -4,6 +4,7 @@ #include "decomp.h" #include "extra.h" #include "mxmediapresenter.h" +#include "mxstring.h" // VTABLE: LEGO1 0x100d5118 // SIZE 0x68 diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h index e4704d21..4e51ebb4 100644 --- a/LEGO1/lego/legoomni/include/legoanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h @@ -2,6 +2,7 @@ #define LEGOANIMPRESENTER_H #include "legoroilist.h" +#include "mxatom.h" #include "mxvideopresenter.h" class LegoAnim; 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/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/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/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 794604ea..1d69d623 100644 --- a/LEGO1/lego/legoomni/src/actors/radio.cpp +++ b/LEGO1/lego/legoomni/src/actors/radio.cpp @@ -6,6 +6,7 @@ #include "legoomni.h" #include "legoworld.h" #include "misc.h" +#include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxcontrolpresenter.h" #include "mxmisc.h" diff --git a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp index f54b1655..59ca793b 100644 --- a/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp +++ b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp @@ -4,6 +4,7 @@ #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/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 9346d4a8..c0e8d07a 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -5,6 +5,7 @@ #include "legoomni.h" #include "legoutils.h" #include "mxcompositepresenter.h" +#include "mxdssubscriber.h" #include "mxmediapresenter.h" #include "mxmisc.h" #include "mxstreamchunk.h" diff --git a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp index 52d82898..c66dd269 100644 --- a/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp +++ b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp @@ -6,6 +6,8 @@ #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 b8bd5a2a..d5ba428b 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -11,6 +11,7 @@ #include "misc/legocontainer.h" #include "misc/legostorage.h" #include "mxmisc.h" +#include "mxvariabletable.h" #include "realtime/realtime.h" #include "roi/legolod.h" #include "viewmanager/viewmanager.h" diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index 762bded2..3237e165 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -44,6 +44,7 @@ #include "mxbackgroundaudiomanager.h" #include "mxmisc.h" #include "mxnotificationmanager.h" +#include "mxnotificationparam.h" #include "mxobjectfactory.h" #include "mxstring.h" #include "mxutilities.h" diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index 92d9bc2e..ae6e3d29 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -21,6 +21,7 @@ #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/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/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index 103e2e7f..067b3b6b 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -20,6 +20,7 @@ #include "mxactionnotificationparam.h" #include "mxautolock.h" #include "mxbackgroundaudiomanager.h" +#include "mxdisplaysurface.h" #include "mxdsfile.h" #include "mxmisc.h" #include "mxnotificationmanager.h" @@ -28,6 +29,7 @@ #include "mxstreamer.h" #include "mxticklemanager.h" #include "mxtransitionmanager.h" +#include "mxvariabletable.h" #include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(LegoOmni, 0x140) diff --git a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp index a6eaab0f..7542192b 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp @@ -5,6 +5,7 @@ #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 3cd6e6a0..32a8d26f 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -15,11 +15,13 @@ #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" diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index c4d455a2..974c2e16 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -14,6 +14,7 @@ #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 c11c9968..87e15745 100644 --- a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp @@ -6,6 +6,8 @@ #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 a1277103..5fbbba21 100644 --- a/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp @@ -5,6 +5,7 @@ #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 0a217da0..0c76b447 100644 --- a/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp @@ -7,6 +7,7 @@ #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 f1c0638a..6e993d3a 100644 --- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -6,7 +6,10 @@ #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/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 5c97ddc0..1902a735 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -22,6 +22,7 @@ #include "mxactionnotificationparam.h" #include "mxbackgroundaudiomanager.h" #include "mxcontrolpresenter.h" +#include "mxdisplaysurface.h" #include "mxmisc.h" #include "mxnotificationmanager.h" #include "mxstillpresenter.h" diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 4bf90ff1..ce8f559d 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -29,6 +29,7 @@ #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/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"