clang-format

ISLE/isleapp.cpp

@@ -189,9 +189,7 @@ MxS32 IsleApp::SetupLegoOmni()
 		failure = Lego()->Create(param) == FAILURE;
 	}
 #else
-	MxS32 failure =
+	MxS32 failure = Lego()->Create(MxOmniCreateParam(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags())) == FAILURE;
-		Lego()->Create(MxOmniCreateParam(mediaPath, hwnd, m_videoParam, MxOmniCreateFlags())) ==
-		FAILURE;
 #endif
 
 	if (!failure) {

LEGO1/lego/legoomni/include/mxtransitionmanager.h

@@ -5,8 +5,8 @@
 #include "lego1_export.h"
 #include "mxcore.h"
 
-#include <ddraw.h>
 #include <SDL3/SDL_stdinc.h>
+#include <ddraw.h>
 
 class MxVideoPresenter;
 

LEGO1/lego/legoomni/src/actors/ambulance.cpp

@@ -23,8 +23,8 @@
 #include "mxvariabletable.h"
 #include "scripts.h"
 
-#include <stdio.h>
 #include <SDL3/SDL_stdinc.h>
+#include <stdio.h>
 
 DECOMP_SIZE_ASSERT(Ambulance, 0x184)
 DECOMP_SIZE_ASSERT(AmbulanceMissionState, 0x24)

LEGO1/lego/legoomni/src/actors/doors.cpp

@@ -6,8 +6,8 @@
 #include "roi/legoroi.h"
 #include "tgl/tglvector.h"
 
-#include <assert.h>
 #include <SDL3/SDL_stdinc.h>
+#include <assert.h>
 
 DECOMP_SIZE_ASSERT(Doors, 0x1f8)
 

LEGO1/lego/legoomni/src/actors/dunebuggy.cpp

@@ -18,8 +18,8 @@
 #include "mxtransitionmanager.h"
 #include "mxvariabletable.h"
 
-#include <stdio.h>
 #include <SDL3/SDL_stdinc.h>
+#include <stdio.h>
 
 DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c)
 

LEGO1/lego/legoomni/src/build/legocarbuild.cpp

@@ -30,13 +30,12 @@
 #include "racecar_actions.h"
 #include "scripts.h"
 
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_timer.h>
 #include <isle.h>
 #include <stdio.h>
 #include <vec.h>
 
-#include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL_timer.h>
-
 // 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

LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp

@@ -28,9 +28,9 @@
 #include "realtime/realtime.h"
 #include "viewmanager/viewmanager.h"
 
+#include <SDL3/SDL_stdinc.h>
 #include <io.h>
 #include <stdio.h>
-#include <SDL3/SDL_stdinc.h>
 #include <vec.h>
 
 DECOMP_SIZE_ASSERT(LegoAnimationManager, 0x500)

LEGO1/lego/legoomni/src/common/legocharactermanager.cpp

@@ -16,8 +16,8 @@
 #include "roi/legolod.h"
 #include "viewmanager/viewmanager.h"
 
-#include <stdio.h>
 #include <SDL3/SDL_stdinc.h>
+#include <stdio.h>
 #include <vec.h>
 
 DECOMP_SIZE_ASSERT(LegoCharacter, 0x08)

LEGO1/lego/legoomni/src/common/legogamestate.cpp

@@ -61,9 +61,9 @@
 #include "sndanim_actions.h"
 #include "towtrack.h"
 
+#include <SDL3/SDL_stdinc.h>
 #include <assert.h>
 #include <stdio.h>
-#include <SDL3/SDL_stdinc.h>
 
 DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)
 DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c)

LEGO1/lego/legoomni/src/control/legometerpresenter.cpp

@@ -8,8 +8,8 @@
 #include "mxutilities.h"
 #include "mxvariabletable.h"
 
-#include <assert.h>
 #include <SDL3/SDL_stdinc.h>
+#include <assert.h>
 
 DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94)
 

LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp

@@ -27,8 +27,8 @@
 #include "mxstl/stlcompat.h"
 #include "mxutilities.h"
 
-#include <stdio.h>
 #include <SDL3/SDL_stdinc.h>
+#include <stdio.h>
 
 DECOMP_SIZE_ASSERT(LegoWorldPresenter, 0x54)
 

LEGO1/lego/sources/roi/legoroi.cpp

@@ -8,11 +8,10 @@
 #include "shape/legobox.h"
 #include "shape/legosphere.h"
 
+#include <SDL3/SDL_stdinc.h>
 #include <string.h>
 #include <vec.h>
 
-#include <SDL3/SDL_stdinc.h>
-
 DECOMP_SIZE_ASSERT(LegoROI, 0x108)
 DECOMP_SIZE_ASSERT(TimeROI, 0x10c)
 

LEGO1/mxdirectx/mxdirectxinfo.cpp

@@ -1,7 +1,7 @@
 #include "mxdirectxinfo.h"
 
-#include <assert.h>
 #include <SDL3/SDL_log.h>
+#include <assert.h>
 #include <stdio.h> // for vsprintf
 
 DECOMP_SIZE_ASSERT(MxAssignedDevice, 0xe4)

LEGO1/omni/include/mxbitmap.h

@@ -4,8 +4,8 @@
 #include "mxcore.h"
 #include "mxtypes.h"
 
-#include <ddraw.h>
 #include <SDL3/SDL_iostream.h>
+#include <ddraw.h>
 #include <stdlib.h>
 
 class MxPalette;

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);

LEGO1/omni/src/audio/mxwavepresenter.cpp

@@ -10,8 +10,8 @@
 #include "mxsoundmanager.h"
 #include "mxutilities.h"
 
-#include <assert.h>
 #include <SDL3/SDL_stdinc.h>
+#include <assert.h>
 
 DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c);
 DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x18);

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 <stdio.h>
 #include <SDL3/SDL_log.h>
+#include <stdio.h>
 
 // FUNCTION: BETA10 0x10124cb9
 int DebugHeapState()

LEGO1/omni/src/common/mxutilities.cpp

@@ -9,8 +9,8 @@
 #include "mxpresenterlist.h"
 #include "mxrect32.h"
 
-#include <assert.h>
 #include <SDL3/SDL_stdinc.h>
+#include <assert.h>
 
 // GLOBAL: LEGO1 0x101020e8
 void (*g_omniUserMessage)(const char*, MxS32) = NULL;

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()

LEGO1/omni/src/video/mxdisplaysurface.cpp

@@ -8,8 +8,8 @@
 #include "mxutilities.h"
 #include "mxvideomanager.h"
 
-#include <assert.h>
 #include <SDL3/SDL_log.h>
+#include <assert.h>
 #include <windows.h>
 
 DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);