From c77b76979009bb831d8929daf9d195d7ebb5f874 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 24 Dec 2024 01:01:15 +0100 Subject: [PATCH] clang-format --- ISLE/isleapp.cpp | 4 +--- .../legoomni/include/mxtransitionmanager.h | 2 +- LEGO1/lego/legoomni/src/actors/ambulance.cpp | 2 +- LEGO1/lego/legoomni/src/actors/doors.cpp | 2 +- LEGO1/lego/legoomni/src/actors/dunebuggy.cpp | 2 +- .../lego/legoomni/src/build/legocarbuild.cpp | 5 ++--- .../src/common/legoanimationmanager.cpp | 2 +- .../src/common/legocharactermanager.cpp | 2 +- .../legoomni/src/common/legogamestate.cpp | 2 +- .../src/control/legometerpresenter.cpp | 2 +- .../src/entity/legoworldpresenter.cpp | 2 +- LEGO1/lego/sources/roi/legoroi.cpp | 3 +-- LEGO1/lego1_export.h | 22 +++++++++---------- LEGO1/mxdirectx/mxdirectxinfo.cpp | 2 +- LEGO1/omni/include/mxbitmap.h | 4 ++-- LEGO1/omni/include/mxdsfile.h | 6 ++--- LEGO1/omni/include/mxvideoparam.h | 7 +++++- LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +- LEGO1/omni/src/common/mxdebug.cpp | 2 +- LEGO1/omni/src/common/mxutilities.cpp | 2 +- LEGO1/omni/src/main/mxomnicreateflags.cpp | 2 +- LEGO1/omni/src/video/mxbitmap.cpp | 2 +- LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 +- 23 files changed, 42 insertions(+), 41 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 68821d91..10a06a6a 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -189,9 +189,7 @@ MxS32 IsleApp::SetupLegoOmni() failure = Lego()->Create(param) == FAILURE; } #else - MxS32 failure = - Lego()->Create(MxOmniCreateParam(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags())) == - FAILURE; + MxS32 failure = Lego()->Create(MxOmniCreateParam(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags())) == FAILURE; #endif if (!failure) { diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h index 2f2a943c..492f28a3 100644 --- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h +++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h @@ -5,8 +5,8 @@ #include "lego1_export.h" #include "mxcore.h" -#include #include +#include class MxVideoPresenter; diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 2a572c43..0244485d 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -23,8 +23,8 @@ #include "mxvariabletable.h" #include "scripts.h" -#include #include +#include DECOMP_SIZE_ASSERT(Ambulance, 0x184) DECOMP_SIZE_ASSERT(AmbulanceMissionState, 0x24) diff --git a/LEGO1/lego/legoomni/src/actors/doors.cpp b/LEGO1/lego/legoomni/src/actors/doors.cpp index ddcdccf1..76e3ee97 100644 --- a/LEGO1/lego/legoomni/src/actors/doors.cpp +++ b/LEGO1/lego/legoomni/src/actors/doors.cpp @@ -6,8 +6,8 @@ #include "roi/legoroi.h" #include "tgl/tglvector.h" -#include #include +#include DECOMP_SIZE_ASSERT(Doors, 0x1f8) diff --git a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp index e77b0598..8dfca16f 100644 --- a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp +++ b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp @@ -18,8 +18,8 @@ #include "mxtransitionmanager.h" #include "mxvariabletable.h" -#include #include +#include DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c) diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index c42dd6c0..3bb285c5 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -30,13 +30,12 @@ #include "racecar_actions.h" #include "scripts.h" +#include +#include #include #include #include -#include -#include - // Names and values verified by BETA10 0x1006d742. // Note that these were probably hard-coded numbers in the original. #define Helicopter_Actor CopterScript::c_Helicopter_Actor diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index ec80f120..586d1236 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -28,9 +28,9 @@ #include "realtime/realtime.h" #include "viewmanager/viewmanager.h" +#include #include #include -#include #include DECOMP_SIZE_ASSERT(LegoAnimationManager, 0x500) diff --git a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp index e51b00f5..53041cde 100644 --- a/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legocharactermanager.cpp @@ -16,8 +16,8 @@ #include "roi/legolod.h" #include "viewmanager/viewmanager.h" -#include #include +#include #include DECOMP_SIZE_ASSERT(LegoCharacter, 0x08) diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index 0391c7f0..21e12a45 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -61,9 +61,9 @@ #include "sndanim_actions.h" #include "towtrack.h" +#include #include #include -#include DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e) DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c) diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp index ea9762fb..380cb7fc 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -8,8 +8,8 @@ #include "mxutilities.h" #include "mxvariabletable.h" -#include #include +#include DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94) diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 8b5985d6..87087a04 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -27,8 +27,8 @@ #include "mxstl/stlcompat.h" #include "mxutilities.h" -#include #include +#include DECOMP_SIZE_ASSERT(LegoWorldPresenter, 0x54) diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp index 35339173..0724042f 100644 --- a/LEGO1/lego/sources/roi/legoroi.cpp +++ b/LEGO1/lego/sources/roi/legoroi.cpp @@ -8,11 +8,10 @@ #include "shape/legobox.h" #include "shape/legosphere.h" +#include #include #include -#include - DECOMP_SIZE_ASSERT(LegoROI, 0x108) DECOMP_SIZE_ASSERT(TimeROI, 0x10c) diff --git a/LEGO1/lego1_export.h b/LEGO1/lego1_export.h index 40acf611..dc248084 100644 --- a/LEGO1/lego1_export.h +++ b/LEGO1/lego1_export.h @@ -2,19 +2,19 @@ #define LEGO1_EXPORT_H #ifdef LEGO1_STATIC -# define LEGO1_EXPORT +#define LEGO1_EXPORT #elif defined(LEGO1_DLL) -# ifdef _WIN32 -# define LEGO1_EXPORT __declspec(dllexport) -# else -# define LEGO1_EXPORT __attribute__((visibility("default"))) -# endif +#ifdef _WIN32 +#define LEGO1_EXPORT __declspec(dllexport) #else -# ifdef _WIN32 -# define LEGO1_EXPORT __declspec(dllimport) -# else -# define LEGO1_EXPORT -# endif +#define LEGO1_EXPORT __attribute__((visibility("default"))) +#endif +#else +#ifdef _WIN32 +#define LEGO1_EXPORT __declspec(dllimport) +#else +#define LEGO1_EXPORT +#endif #endif #endif diff --git a/LEGO1/mxdirectx/mxdirectxinfo.cpp b/LEGO1/mxdirectx/mxdirectxinfo.cpp index a768b8c8..d41e195a 100644 --- a/LEGO1/mxdirectx/mxdirectxinfo.cpp +++ b/LEGO1/mxdirectx/mxdirectxinfo.cpp @@ -1,7 +1,7 @@ #include "mxdirectxinfo.h" -#include #include +#include #include // for vsprintf DECOMP_SIZE_ASSERT(MxAssignedDevice, 0xe4) diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h index 439fcc9a..68e9ebf8 100644 --- a/LEGO1/omni/include/mxbitmap.h +++ b/LEGO1/omni/include/mxbitmap.h @@ -4,8 +4,8 @@ #include "mxcore.h" #include "mxtypes.h" -#include #include +#include #include class MxPalette; @@ -44,7 +44,7 @@ class MxBitmap : public MxCore { virtual MxResult ImportBitmap(MxBitmap* p_bitmap); // vtable+14 virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info); // vtable+18 virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+1c - virtual MxResult LoadFile(SDL_IOStream* p_handle); // vtable+20 + virtual MxResult LoadFile(SDL_IOStream* p_handle); // vtable+20 virtual MxLong Read(const char* p_filename); // vtable+24 // FUNCTION: LEGO1 0x1004e0d0 diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h index 9999d385..730876ba 100644 --- a/LEGO1/omni/include/mxdsfile.h +++ b/LEGO1/omni/include/mxdsfile.h @@ -14,9 +14,9 @@ class MxDSFile : public MxDSSource { public: MxDSFile(const char* p_filename, MxULong p_skipReadingChunks); - enum { - OPEN_READ = 0, - }; + enum { + OPEN_READ = 0, + }; #ifdef ISLE_APP ~MxDSFile() override { Close(); } diff --git a/LEGO1/omni/include/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h index ba1a4cb6..b9bf0202 100644 --- a/LEGO1/omni/include/mxvideoparam.h +++ b/LEGO1/omni/include/mxvideoparam.h @@ -15,7 +15,12 @@ class MxPalette; class MxVideoParam { public: LEGO1_EXPORT MxVideoParam(); - LEGO1_EXPORT MxVideoParam(MxRect32& p_rect, MxPalette* p_palette, MxULong p_backBuffers, MxVideoParamFlags& p_flags); + LEGO1_EXPORT MxVideoParam( + MxRect32& p_rect, + MxPalette* p_palette, + MxULong p_backBuffers, + MxVideoParamFlags& p_flags + ); MxVideoParam(MxVideoParam& p_videoParam); LEGO1_EXPORT ~MxVideoParam(); LEGO1_EXPORT void SetDeviceName(char* p_deviceId); diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index a510931d..e7a078ef 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -10,8 +10,8 @@ #include "mxsoundmanager.h" #include "mxutilities.h" -#include #include +#include DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c); DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x18); diff --git a/LEGO1/omni/src/common/mxdebug.cpp b/LEGO1/omni/src/common/mxdebug.cpp index 16ed460c..edb7865f 100644 --- a/LEGO1/omni/src/common/mxdebug.cpp +++ b/LEGO1/omni/src/common/mxdebug.cpp @@ -6,8 +6,8 @@ // Identical functions at BETA10 0x100ec9fe and 0x101741b5 are more limited in scope. // This is the most widely used version. -#include #include +#include // FUNCTION: BETA10 0x10124cb9 int DebugHeapState() diff --git a/LEGO1/omni/src/common/mxutilities.cpp b/LEGO1/omni/src/common/mxutilities.cpp index c7269d1e..e659c0f1 100644 --- a/LEGO1/omni/src/common/mxutilities.cpp +++ b/LEGO1/omni/src/common/mxutilities.cpp @@ -9,8 +9,8 @@ #include "mxpresenterlist.h" #include "mxrect32.h" -#include #include +#include // GLOBAL: LEGO1 0x101020e8 void (*g_omniUserMessage)(const char*, MxS32) = NULL; diff --git a/LEGO1/omni/src/main/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp index 2edaaf17..1c3e9c9d 100644 --- a/LEGO1/omni/src/main/mxomnicreateflags.cpp +++ b/LEGO1/omni/src/main/mxomnicreateflags.cpp @@ -3,7 +3,7 @@ #include "decomp.h" DECOMP_SIZE_ASSERT(MxOmniCreateFlags, 0x02) - +// // FUNCTION: LEGO1 0x100b0a30 // FUNCTION: BETA10 0x10130a1c MxOmniCreateFlags::MxOmniCreateFlags() diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp index a2fc3dc0..07f98949 100644 --- a/LEGO1/omni/src/video/mxbitmap.cpp +++ b/LEGO1/omni/src/video/mxbitmap.cpp @@ -175,7 +175,7 @@ MxResult MxBitmap::ImportBitmap(MxBitmap* p_bitmap) MxLong MxBitmap::Read(const char* p_filename) { MxResult result = FAILURE; - SDL_IOStream *handle; + SDL_IOStream* handle; handle = SDL_IOFromFile(p_filename, "rb"); diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index 978e323b..6a2baddf 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -8,8 +8,8 @@ #include "mxutilities.h" #include "mxvideomanager.h" -#include #include +#include #include DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);