From 41dce8d66225c9f0dd5429949154f7593171d0ed Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 9 Mar 2024 14:16:26 -0500 Subject: [PATCH] Refactor mxutil --- CMakeLists.txt | 2 +- LEGO1/lego/legoomni/include/legoutil.h | 2 +- LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp | 2 +- LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp | 2 +- LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp | 2 +- LEGO1/lego/legoomni/src/video/legometerpresenter.cpp | 2 +- LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 2 +- LEGO1/omni/include/{mxutil.h => mxutilities.h} | 0 LEGO1/omni/src/action/mxdsaction.cpp | 2 +- LEGO1/omni/src/action/mxdsmediaaction.cpp | 2 +- LEGO1/omni/src/action/mxdsobject.cpp | 2 +- LEGO1/omni/src/action/mxdssound.cpp | 2 +- LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +- LEGO1/omni/src/common/mxpresenter.cpp | 2 +- LEGO1/omni/src/common/{mxutil.cpp => mxutilities.cpp} | 2 +- LEGO1/omni/src/stream/mxstreamchunk.cpp | 2 +- LEGO1/omni/src/stream/mxstreamcontroller.cpp | 2 +- LEGO1/omni/src/video/mxbitmap.cpp | 2 +- LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 +- LEGO1/omni/src/video/mxstillpresenter.cpp | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename LEGO1/omni/include/{mxutil.h => mxutilities.h} (100%) rename LEGO1/omni/src/common/{mxutil.cpp => mxutilities.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 359cdff3..ad059d9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,7 +222,7 @@ add_library(omni STATIC LEGO1/omni/src/common/mxstring.cpp LEGO1/omni/src/common/mxticklemanager.cpp LEGO1/omni/src/common/mxtimer.cpp - LEGO1/omni/src/common/mxutil.cpp + LEGO1/omni/src/common/mxutilities.cpp LEGO1/omni/src/common/mxvariable.cpp LEGO1/omni/src/common/mxvariabletable.cpp LEGO1/omni/src/entity/mxentity.cpp diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h index 5e4a57f5..dcd62705 100644 --- a/LEGO1/lego/legoomni/include/legoutil.h +++ b/LEGO1/lego/legoomni/include/legoutil.h @@ -6,7 +6,7 @@ #include "misc/legotexture.h" #include "mxstring.h" #include "mxtypes.h" -#include "mxutil.h" +#include "mxutilities.h" #include diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index aaa7c475..a5acbc8d 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -8,7 +8,7 @@ #include "mxpresenter.h" #include "mxstreamer.h" #include "mxticklemanager.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxBackgroundAudioManager, 0x150) diff --git a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp index 0db69c06..58c21544 100644 --- a/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp @@ -6,7 +6,7 @@ #include "mxmisc.h" #include "mxticklemanager.h" #include "mxtimer.h" -#include "mxutil.h" +#include "mxutilities.h" #include "mxvideopresenter.h" DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c) diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index eb131c0c..756e32f9 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -25,7 +25,7 @@ #include "mxobjectfactory.h" #include "mxpresenter.h" #include "mxstl/stlcompat.h" -#include "mxutil.h" +#include "mxutilities.h" #include diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp index 529560f9..a41de713 100644 --- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp @@ -2,7 +2,7 @@ #include "decomp.h" #include "mxbitmap.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94) diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 1cfe35de..83938dfb 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -12,7 +12,7 @@ #include "misc/legotexture.h" #include "misc/version.h" #include "mxcompositepresenter.h" -#include "mxutil.h" +#include "mxutilities.h" #include "roi/legoroi.h" // GLOBAL: LEGO1 0x100f7ae0 diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutilities.h similarity index 100% rename from LEGO1/omni/include/mxutil.h rename to LEGO1/omni/include/mxutilities.h diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp index 975cb2b7..0a72abd8 100644 --- a/LEGO1/omni/src/action/mxdsaction.cpp +++ b/LEGO1/omni/src/action/mxdsaction.cpp @@ -2,7 +2,7 @@ #include "mxmisc.h" #include "mxtimer.h" -#include "mxutil.h" +#include "mxutilities.h" #include #include diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp index c563b380..26699fcb 100644 --- a/LEGO1/omni/src/action/mxdsmediaaction.cpp +++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp @@ -1,6 +1,6 @@ #include "mxdsmediaaction.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8) diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp index 9bbdf195..c0db27d9 100644 --- a/LEGO1/omni/src/action/mxdsobject.cpp +++ b/LEGO1/omni/src/action/mxdsobject.cpp @@ -11,7 +11,7 @@ #include "mxdsserialaction.h" #include "mxdssound.h" #include "mxdsstill.h" -#include "mxutil.h" +#include "mxutilities.h" #include #include diff --git a/LEGO1/omni/src/action/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp index e75ad0c9..d2075dbd 100644 --- a/LEGO1/omni/src/action/mxdssound.cpp +++ b/LEGO1/omni/src/action/mxdssound.cpp @@ -1,6 +1,6 @@ #include "mxdssound.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxDSSound, 0xc0) diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index 3d48a03c..af32e4dd 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -7,7 +7,7 @@ #include "mxmisc.h" #include "mxomni.h" #include "mxsoundmanager.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c); DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x18); diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index cc418f39..1c81764e 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -14,7 +14,7 @@ #include "mxomni.h" #include "mxparam.h" #include "mxstreamer.h" -#include "mxutil.h" +#include "mxutilities.h" #include diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutilities.cpp similarity index 99% rename from LEGO1/omni/src/common/mxutil.cpp rename to LEGO1/omni/src/common/mxutilities.cpp index fea13f12..052ab57c 100644 --- a/LEGO1/omni/src/common/mxutil.cpp +++ b/LEGO1/omni/src/common/mxutilities.cpp @@ -1,4 +1,4 @@ -#include "mxutil.h" +#include "mxutilities.h" #include "mxcompositepresenter.h" #include "mxdsaction.h" diff --git a/LEGO1/omni/src/stream/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp index 9d30e70d..9d5d0fe4 100644 --- a/LEGO1/omni/src/stream/mxstreamchunk.cpp +++ b/LEGO1/omni/src/stream/mxstreamchunk.cpp @@ -2,7 +2,7 @@ #include "mxdsbuffer.h" #include "mxstreamlist.h" -#include "mxutil.h" +#include "mxutilities.h" // FUNCTION: LEGO1 0x100c2fe0 MxStreamChunk::~MxStreamChunk() diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index 3948376c..bcad399d 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -8,7 +8,7 @@ #include "mxstl/stlcompat.h" #include "mxstreamchunk.h" #include "mxtimer.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxStreamController, 0x64) DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14) diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp index 98f1f6b2..983dece4 100644 --- a/LEGO1/omni/src/video/mxbitmap.cpp +++ b/LEGO1/omni/src/video/mxbitmap.cpp @@ -1,7 +1,7 @@ #include "mxbitmap.h" #include "decomp.h" -#include "mxutil.h" +#include "mxutilities.h" DECOMP_SIZE_ASSERT(MxBitmap, 0x20); DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428); diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index 9c7c7088..c599b131 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -2,7 +2,7 @@ #include "mxmisc.h" #include "mxomni.h" -#include "mxutil.h" +#include "mxutilities.h" #include "mxvideomanager.h" #include diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index d926d189..4093dabe 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -6,7 +6,7 @@ #include "mxdsmediaaction.h" #include "mxmisc.h" #include "mxomni.h" -#include "mxutil.h" +#include "mxutilities.h" #include "mxvideomanager.h" DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c);