Merge branch 'master' into mxregion

.clang-format

@@ -0,0 +1,25 @@
+BasedOnStyle: Microsoft
+
+AccessModifierOffset: -4
+AlignAfterOpenBracket: BlockIndent
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BracedInitializerIndentWidth: 4
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterStruct: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+IncludeBlocks: Regroup
+IndentAccessModifiers: false
+IndentWidth: 4
+PointerAlignment: Left
+SpaceAfterCStyleCast: true
+TabWidth: 4
+UseTab: ForContinuationAndIndentation

.editorconfig

@@ -1,7 +1,13 @@
 root = true
-[*.{cpp,h,py,txt,editorconfig}]
 
+[*.{py,txt,editorconfig}]
 indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.{cpp,h}]
+indent_style = tab
+tab_width = 4
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/format.yml

@@ -0,0 +1,20 @@
+name: Format
+
+on: [push, pull_request]
+
+jobs:
+  clang-format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Run clang-format
+      run: |
+        pipx run "clang-format>=17,<18" \
+          --Werror \
+          --dry-run \
+          --style=file \
+          ISLE/*.cpp ISLE/*.h \
+          LEGO1/*.cpp LEGO1/*.h \
+          LEGO1/realtime/*.cpp LEGO1/realtime/*.h

CMakeLists.txt

@@ -200,7 +200,8 @@ add_library(lego1 SHARED
   LEGO1/racestate.cpp
   LEGO1/radio.cpp
   LEGO1/radiostate.cpp
-  LEGO1/realtimeview.cpp
+  LEGO1/realtime/realtime.cpp
+  LEGO1/realtime/realtimeview.cpp
   LEGO1/registrationbook.cpp
   LEGO1/score.cpp
   LEGO1/scorestate.cpp
@@ -209,6 +210,12 @@ add_library(lego1 SHARED
   LEGO1/towtrackmissionstate.cpp
   LEGO1/viewmanager.cpp
 )
+if (MINGW)
+  target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500)
+endif()
+
+# Additional include directories for both targets
+include_directories("${CMAKE_SOURCE_DIR}/3rdparty/vec")
 
 if (ISLE_USE_SMARTHEAP)
   add_library(SmartHeap::SmartHeap STATIC IMPORTED)

ISLE/isleapp.cpp

@@ -1,8 +1,6 @@
 #include "isleapp.h"
+
 #include "define.h"
-
-#include <dsound.h>
-
 #include "legoanimationmanager.h"
 #include "legobuildingmanager.h"
 #include "legogamestate.h"
@@ -22,9 +20,10 @@
 #include "mxticklemanager.h"
 #include "mxtimer.h"
 #include "mxtransitionmanager.h"
-
 #include "res/resource.h"
 
+#include <dsound.h>
+
 // OFFSET: ISLE 0x401000
 IsleApp::IsleApp()
 {
@@ -129,7 +128,9 @@ BOOL IsleApp::SetupLegoOmni()
 	char mediaPath[256];
 	GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath));
 
-  BOOL failure = Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__ *) m_windowHandle, m_videoParam, MxOmniCreateFlags())) == FAILURE;
+	BOOL failure =
+		Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__*) m_windowHandle, m_videoParam, MxOmniCreateFlags())
+		) == FAILURE;
 	if (!failure) {
 		VariableTable()->SetVariable("ACTOR_01", "");
 		TickleManager()->SetClientTickleInterval(VideoManager(), 10);
@@ -140,9 +141,17 @@ BOOL IsleApp::SetupLegoOmni()
 }
 
 // OFFSET: ISLE 0x401560
-void IsleApp::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                           BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
-                           BOOL wideViewAngle, char *deviceId)
+void IsleApp::SetupVideoFlags(
+	BOOL fullScreen,
+	BOOL flipSurfaces,
+	BOOL backBuffers,
+	BOOL using8bit,
+	BOOL using16bit,
+	BOOL param_6,
+	BOOL param_7,
+	BOOL wideViewAngle,
+	char* deviceId
+)
 {
 	m_videoParam.flags().SetFullScreen(fullScreen);
 	m_videoParam.flags().SetFlipSurfaces(flipSurfaces);
@@ -183,8 +192,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	// Throw error if sound unavailable
 	if (!soundReady) {
-    MessageBoxA(NULL, "\"LEGO\xAE Island\" is not detecting a DirectSound compatible sound card.  Please quit all other applications and try again.",
-      "Lego Island Error", MB_OK);
+		MessageBoxA(
+			NULL,
+			"\"LEGO\xAE Island\" is not detecting a DirectSound compatible sound card.  Please quit all other "
+			"applications and try again.",
+			"Lego Island Error",
+			MB_OK
+		);
 		return 0;
 	}
 
@@ -193,7 +207,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	// Create window
 	if (g_isle->SetupWindow(hInstance, lpCmdLine) != SUCCESS) {
-    MessageBoxA(NULL, "\"LEGO\xAE Island\" failed to start.  Please quit all other applications and try again.", "LEGO\xAE Island Error", MB_OK);
+		MessageBoxA(
+			NULL,
+			"\"LEGO\xAE Island\" failed to start.  Please quit all other applications and try again.",
+			"LEGO\xAE Island Error",
+			MB_OK
+		);
 		return 0;
 	}
 
@@ -203,12 +222,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		window = g_isle->m_windowHandle;
 	}
 
-  // Load accelerators (this call actually achieves nothing - there is no "AppAccel" resource in the original - but we'll keep this for authenticity)
-  // This line may actually be here because it's in DFVIEW, an example project that ships with
-  // MSVC420, and was such a clean example of a Win32 app, that it was later adapted
-  // into an "ExeSkeleton" sample for MSVC600. It's quite possible Mindscape derived
-  // this app from that example since they no longer had the luxury of the
-  // MFC AppWizard which we know they used for the frontend used during development (ISLEMFC.EXE, MAIN.EXE, et al.)
+	// Load accelerators (this call actually achieves nothing - there is no "AppAccel" resource in the original - but
+	// we'll keep this for authenticity) This line may actually be here because it's in DFVIEW, an example project that
+	// ships with MSVC420, and was such a clean example of a Win32 app, that it was later adapted into an "ExeSkeleton"
+	// sample for MSVC600. It's quite possible Mindscape derived this app from that example since they no longer had the
+	// luxury of the MFC AppWizard which we know they used for the frontend used during development (ISLEMFC.EXE,
+	// MAIN.EXE, et al.)
 	LoadAcceleratorsA(hInstance, "AppAccel");
 
 	MSG msg;
@@ -230,11 +249,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			}
 
 			MSG nextMsg;
-      if (!g_isle
-          || !g_isle->m_windowHandle
-          || msg.message != WM_MOUSEMOVE
-          || !PeekMessageA(&nextMsg, NULL, 0, 0, PM_NOREMOVE)
-          || nextMsg.message != WM_MOUSEMOVE) {
+			if (!g_isle || !g_isle->m_windowHandle || msg.message != WM_MOUSEMOVE ||
+				!PeekMessageA(&nextMsg, NULL, 0, 0, PM_NOREMOVE) || nextMsg.message != WM_MOUSEMOVE) {
 				TranslateMessage(&msg);
 				DispatchMessageA(&msg);
 			}
@@ -309,9 +325,14 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	case WM_ACTIVATEAPP:
 		if (g_isle) {
 			if ((wParam != 0) && (g_isle->m_fullScreen)) {
-        MoveWindow(hWnd, g_windowRect.left, g_windowRect.top,
+				MoveWindow(
+					hWnd,
+					g_windowRect.left,
+					g_windowRect.top,
 					(g_windowRect.right - g_windowRect.left) + 1,
-                   (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+					(g_windowRect.bottom - g_windowRect.top) + 1,
+					TRUE
+				);
 			}
 			g_isle->m_windowActive = wParam;
 		}
@@ -346,7 +367,8 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 				PostMessageA(g_isle->m_windowHandle, WM_CLOSE, 0, 0);
 				return 0;
 			}
-    } else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) {
+		}
+		else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) {
 			return 0;
 		}
 		return DefWindowProcA(hWnd, uMsg, wParam, lParam);
@@ -364,7 +386,8 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 		return DefWindowProcA(hWnd, uMsg, wParam, lParam);
 	case WM_DISPLAYCHANGE:
-    if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->GetDirect3D() && VideoManager()->GetDirect3D()->GetDeviceModeFinder()) {
+		if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->GetDirect3D() &&
+			VideoManager()->GetDirect3D()->GetDeviceModeFinder()) {
 			int targetWidth = LOWORD(lParam);
 			int targetHeight = HIWORD(lParam);
 			int targetDepth = wParam;
@@ -463,8 +486,17 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 
 	LoadConfig();
 
-  SetupVideoFlags(m_fullScreen, m_flipSurfaces, m_backBuffersInVram, m_using8bit,
-                  m_using16bit, m_unk24, FALSE, m_wideViewAngle, m_deviceId);
+	SetupVideoFlags(
+		m_fullScreen,
+		m_flipSurfaces,
+		m_backBuffersInVram,
+		m_using8bit,
+		m_using16bit,
+		m_unk24,
+		FALSE,
+		m_wideViewAngle,
+		m_deviceId
+	);
 
 	MxOmni::SetSound3D(m_use3dSound);
 
@@ -501,9 +533,13 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 			g_windowRect.top,
 			g_windowRect.right - g_windowRect.left + 1,
 			g_windowRect.bottom - g_windowRect.top + 1,
-      NULL, NULL, hInstance, NULL
+			NULL,
+			NULL,
+			hInstance,
+			NULL
 		);
-  } else {
+	}
+	else {
 		AdjustWindowRectEx(&g_windowRect, WS_CAPTION | WS_SYSMENU, 0, WS_EX_APPWINDOW);
 
 		m_windowHandle = CreateWindowExA(
@@ -515,7 +551,10 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 			CW_USEDEFAULT,
 			g_windowRect.right - g_windowRect.left + 1,
 			g_windowRect.bottom - g_windowRect.top + 1,
-      NULL, NULL, hInstance, NULL
+			NULL,
+			NULL,
+			hInstance,
+			NULL
 		);
 	}
 
@@ -524,7 +563,14 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 	}
 
 	if (m_fullScreen) {
-    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+		MoveWindow(
+			m_windowHandle,
+			g_windowRect.left,
+			g_windowRect.top,
+			(g_windowRect.right - g_windowRect.left) + 1,
+			(g_windowRect.bottom - g_windowRect.top) + 1,
+			TRUE
+		);
 	}
 
 	ShowWindow(m_windowHandle, SW_SHOWNORMAL);
@@ -563,7 +609,14 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 		}
 	}
 	if (m_fullScreen) {
-    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+		MoveWindow(
+			m_windowHandle,
+			g_windowRect.left,
+			g_windowRect.top,
+			(g_windowRect.right - g_windowRect.left) + 1,
+			(g_windowRect.bottom - g_windowRect.top) + 1,
+			TRUE
+		);
 	}
 	ShowWindow(m_windowHandle, SW_SHOWNORMAL);
 	UpdateWindow(m_windowHandle);
@@ -664,7 +717,8 @@ void IsleApp::LoadConfig()
 	if (ReadRegInt("Display Bit Depth", &bitDepth)) {
 		if (bitDepth == 8) {
 			m_using8bit = TRUE;
-    } else if (bitDepth == 16) {
+		}
+		else if (bitDepth == 16) {
 			m_using16bit = TRUE;
 		}
 	}
@@ -698,9 +752,12 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 		return;
 	}
 
-  if (!Lego()) return;
-  if (!TickleManager()) return;
-  if (!Timer()) return;
+	if (!Lego())
+		return;
+	if (!TickleManager())
+		return;
+	if (!Timer())
+		return;
 
 	MxLong currentTime = Timer()->GetRealTime();
 	if (currentTime < g_lastFrameTime) {
@@ -742,7 +799,8 @@ inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 			if (Start(&ds) != SUCCESS) {
 				return;
 			}
-    } else {
+		}
+		else {
 			ds.SetAtomId(stream->GetAtom());
 			ds.SetUnknown24(-1);
 			ds.SetObjectId(0);

ISLE/isleapp.h

@@ -1,13 +1,12 @@
 #ifndef ISLEAPP_H
 #define ISLEAPP_H
 
-#include <windows.h>
-
 #include "mxtypes.h"
 #include "mxvideoparam.h"
 
-class IsleApp
-{
+#include <windows.h>
+
+class IsleApp {
 public:
 	IsleApp();
 	~IsleApp();
@@ -15,9 +14,17 @@ public:
 	void Close();
 
 	BOOL SetupLegoOmni();
-  void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                       BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
-                       BOOL wideViewAngle, char *deviceId);
+	void SetupVideoFlags(
+		BOOL fullScreen,
+		BOOL flipSurfaces,
+		BOOL backBuffers,
+		BOOL using8bit,
+		BOOL using16bit,
+		BOOL param_6,
+		BOOL param_7,
+		BOOL wideViewAngle,
+		char* deviceId
+	);
 	MxResult SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine);
 
 	BOOL ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize);

LEGO1/act1state.cpp

@@ -5,4 +5,3 @@ Act1State::Act1State()
 {
 	// TODO
 }
-

LEGO1/act1state.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d7028
 // SIZE 0x26c
-class Act1State : public LegoState
-{
+class Act1State : public LegoState {
 public:
 	Act1State();
 

LEGO1/act2brick.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d9b60
 // SIZE 0x194
-class Act2Brick : public LegoPathActor
-{
+class Act2Brick : public LegoPathActor {
 public:
 	Act2Brick();
 	virtual ~Act2Brick() override; // vtable+0x0
@@ -26,7 +25,6 @@ public:
 	{
 		return !strcmp(Act2Brick::ClassName(), name) || LegoEntity::IsA(name);
 	}
-
 };
 
 #endif // ACT2BRICK_H

LEGO1/act2policestation.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d53a8
 // SIZE 0x68
-class Act2PoliceStation : public LegoEntity
-{
+class Act2PoliceStation : public LegoEntity {
 public:
 	virtual MxLong Notify(MxParam& p) override; // vtable+0x4
 

LEGO1/act3.cpp

@@ -1,5 +1,7 @@
 #include "act3.h"
 
+DECOMP_SIZE_ASSERT(Act3, 0x4274)
+
 // OFFSET: LEGO1 0x10072270 STUB
 Act3::Act3()
 {

LEGO1/act3.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d9628
 // SIZE 0x4274
-class Act3 : public LegoWorld
-{
+class Act3 : public LegoWorld {
 public:
 	Act3();
 
@@ -25,7 +24,12 @@ public:
 		return !strcmp(name, Act3::ClassName()) || LegoWorld::IsA(name);
 	}
 
+	inline void SetUnkown420c(MxEntity* p_entity) { m_unk420c = p_entity; }
+
+protected:
+	undefined m_unkf8[0x4114];
+	MxEntity* m_unk420c;
+	undefined m_unk4210[0x64];
 };
 
-
 #endif // ACT3_H

LEGO1/act3actor.h

@@ -3,8 +3,7 @@
 
 // FIXME: Uncertain location. There are three vtables which eventually call this
 //        class' ClassName() function, but none of them call it directly.
-class Act3Actor
-{
+class Act3Actor {
 public:
 	// OFFSET: LEGO1 0x100431b0
 	inline virtual const char* ClassName() override
@@ -12,7 +11,6 @@ public:
 		// 0x100f03ac
 		return "Act3Actor";
 	}
-
 };
 
 #endif // ACT3ACTOR_H

LEGO1/act3shark.h

@@ -4,8 +4,7 @@
 #include "legoanimactor.h"
 
 // VTABLE 0x100d7920
-class Act3Shark : public LegoAnimActor
-{
+class Act3Shark : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x100430c0
 	inline virtual const char* ClassName() const override

LEGO1/act3state.h

@@ -5,13 +5,9 @@
 
 // VTABLE 0x100d4fc8
 // SIZE 0xc
-class Act3State : public LegoState
-{
+class Act3State : public LegoState {
 public:
-  inline Act3State()
-  {
-    m_unk08 = 0;
-  }
+	inline Act3State() { m_unk08 = 0; }
 
 	// OFFSET: LEGO1 0x1000e300
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -31,7 +27,6 @@ public:
 private:
 	// FIXME: May be part of LegoState? Uncertain...
 	MxU32 m_unk08;
-
 };
 
 #endif // ACT3STATE_H

LEGO1/ambulance.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d71a8
 // SIZE 0x184
-class Ambulance : public IslePathActor
-{
+class Ambulance : public IslePathActor {
 public:
 	Ambulance();
 
@@ -22,6 +21,7 @@ public:
 	{
 		return !strcmp(name, Ambulance::ClassName()) || IslePathActor::IsA(name);
 	}
+
 private:
 	// TODO: Ambulance fields
 	undefined m_unk160[4];

LEGO1/ambulancemissionstate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d72a0
 // SIZE 0x24
-class AmbulanceMissionState : public LegoState
-{
+class AmbulanceMissionState : public LegoState {
 public:
 	AmbulanceMissionState();
 
@@ -25,16 +24,22 @@ public:
 
 	inline MxU16 GetColor(MxU8 id)
 	{
-    switch (id)
-    {
-    case 1: return m_color1;
-    case 2: return m_color2;
-    case 3: return m_color3;
-    case 4: return m_color4;
-    case 5: return m_color5;
-    default: return 0;
+		switch (id) {
+		case 1:
+			return m_color1;
+		case 2:
+			return m_color2;
+		case 3:
+			return m_color3;
+		case 4:
+			return m_color4;
+		case 5:
+			return m_color5;
+		default:
+			return 0;
 		}
 	}
+
 protected:
 	undefined m_unk8[0x12];
 	MxU16 m_color1;
@@ -44,5 +49,4 @@ protected:
 	MxU16 m_color5;
 };
 
-
 #endif // AMBULANCEMISSIONSTATE_H

LEGO1/animstate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d8d80
 // SIZE 0x1c
-class AnimState : public LegoState
-{
+class AnimState : public LegoState {
 public:
 	AnimState();
 	virtual ~AnimState() override; // vtable+0x0
@@ -23,7 +22,6 @@ public:
 	{
 		return !strcmp(name, AnimState::ClassName()) || LegoState::IsA(name);
 	}
-
 };
 
 #endif // ANIMSTATE_H

LEGO1/beachhouseentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4a18
 // SIZE 0x68
-class BeachHouseEntity : public BuildingEntity
-{
+class BeachHouseEntity : public BuildingEntity {
 public:
 	virtual MxLong Notify(MxParam& p) override; // vtable+04
 

LEGO1/bike.cpp

@@ -9,4 +9,3 @@ Bike::Bike()
 	this->m_unk150 = 3.0;
 	this->m_unk148 = 1;
 }
-

LEGO1/bike.h

@@ -6,8 +6,7 @@
 
 // VTABLE 0x100d9808
 // SIZE 0x164
-class Bike : public IslePathActor
-{
+class Bike : public IslePathActor {
 public:
 	Bike();
 
@@ -23,10 +22,10 @@ public:
 	{
 		return !strcmp(name, Bike::ClassName()) || IslePathActor::IsA(name);
 	}
+
 private:
 	// TODO: Bike fields
 	undefined m_unk160[4];
 };
 
-
 #endif // BIKE_H

LEGO1/buildingentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5c88
 // SIZE <= 0x68, hard to tell because it's always constructed as a derivative
-class BuildingEntity : public LegoEntity
-{
+class BuildingEntity : public LegoEntity {
 public:
 	BuildingEntity();
 	virtual ~BuildingEntity() override; // vtable+0x0

LEGO1/bumpbouy.h

@@ -5,8 +5,7 @@
 #include "mxtypes.h"
 
 // VTABLE 0x100d6790
-class BumpBouy : public LegoAnimActor
-{
+class BumpBouy : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x100274e0
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/carrace.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5e50
 // SIZE 0x154
-class CarRace : public LegoRace
-{
+class CarRace : public LegoRace {
 public:
 	CarRace();
 

LEGO1/carracestate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4b70
 // SIZE 0x2c
-class CarRaceState : public RaceState
-{
+class CarRaceState : public RaceState {
 public:
 	// OFFSET: LEGO1 0x1000dd30
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/compat.h

@@ -20,7 +20,10 @@
 #pragma warning(disable : 4786)
 // To really remove *all* of the warnings, we have to employ the following,
 // obscure workaround from https://www.earthli.com/news/view_article.php?id=376
-static class msVC6_4786WorkAround { public: msVC6_4786WorkAround() {} } msVC6_4786WorkAround;
+static class msVC6_4786WorkAround {
+public:
+	msVC6_4786WorkAround() {}
+} msVC6_4786WorkAround;
 
 #define MSVC420_VERSION 1020
 
@@ -31,7 +34,8 @@ static class msVC6_4786WorkAround { public: msVC6_4786WorkAround() {} } msVC6_47
 #include <algorithm>
 #include <list>
 #include <set>
-using namespace std;
+using std::list;
+using std::set;
 #endif
 
 // We use `override` so newer compilers can tell us our vtables are valid,

LEGO1/decomp.h

@@ -1,8 +1,17 @@
 #ifndef DECOMP_H
 #define DECOMP_H
 
-#define DECOMP_STATIC_ASSERT(V) namespace { typedef int foo[(V)?1:-1]; }
+#if defined(_MSC_VER)
+#define DECOMP_STATIC_ASSERT(V)                                                                                        \
+	namespace                                                                                                          \
+	{                                                                                                                  \
+	typedef int foo[(V) ? 1 : -1];                                                                                     \
+	}
 #define DECOMP_SIZE_ASSERT(T, S) DECOMP_STATIC_ASSERT(sizeof(T) == S)
+#else
+#define DECOMP_STATIC_ASSERT(V)
+#define DECOMP_SIZE_ASSERT(T, S)
+#endif
 
 #ifndef _countof
 #define _countof(arr) sizeof(arr) / sizeof(arr[0])

LEGO1/doors.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4788
 // SIZE 0x1f8
-class Doors : public LegoPathActor
-{
+class Doors : public LegoPathActor {
 public:
 	// OFFSET: LEGO1 0x1000e430
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -22,5 +21,4 @@ public:
 	}
 };
 
-
 #endif // DOORS_H

LEGO1/dunebuggy.h

@@ -6,8 +6,7 @@
 
 // VTABLE 0x100d8f98
 // SIZE 0x16c
-class DuneBuggy : public IslePathActor
-{
+class DuneBuggy : public IslePathActor {
 public:
 	DuneBuggy();
 
@@ -23,6 +22,7 @@ public:
 	{
 		return !strcmp(name, DuneBuggy::ClassName()) || IslePathActor::IsA(name);
 	}
+
 private:
 	// TODO: Double check DuneBuggy field types
 	undefined4 m_unk160;

LEGO1/elevatorbottom.h

@@ -4,8 +4,7 @@
 #include "legoworld.h"
 
 // VTABLE 0x100d5f20
-class ElevatorBottom : public LegoWorld
-{
+class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
 	virtual ~ElevatorBottom() override; // vtable+0x0
@@ -24,7 +23,6 @@ public:
 	{
 		return !strcmp(name, ElevatorBottom::ClassName()) || LegoWorld::IsA(name);
 	}
-
 };
 
 #endif // ELEVATORBOTTOM_H

LEGO1/extra.h

@@ -3,8 +3,7 @@
 
 // Items related to the Extra string of key-value pairs found in MxOb
 
-enum ExtraActionType
-{
+enum ExtraActionType {
 	ExtraActionType_opendisk = 1,
 	ExtraActionType_openram = 2,
 	ExtraActionType_close = 3,

LEGO1/gasstation.h

@@ -6,8 +6,7 @@
 // VTABLE 0x100d4650
 // SIZE 0x128
 // Radio variable at 0x46, in constructor
-class GasStation : public LegoWorld
-{
+class GasStation : public LegoWorld {
 public:
 	GasStation();
 	virtual ~GasStation() override; // vtable+0x0
@@ -27,7 +26,6 @@ public:
 	{
 		return !strcmp(name, GasStation::ClassName()) || LegoWorld::IsA(name);
 	}
-
 };
 
 #endif // GASSTATION_H

LEGO1/gasstationentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5258
 // SIZE 0x68
-class GasStationEntity : public BuildingEntity
-{
+class GasStationEntity : public BuildingEntity {
 public:
 	// OFFSET: LEGO1 0x1000eb20
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/gasstationstate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d46e0
 // SIZE 0x24
-class GasStationState : public LegoState
-{
+class GasStationState : public LegoState {
 public:
 	GasStationState();
 

LEGO1/gifmanager.h

@@ -4,11 +4,10 @@
 #include "decomp.h"
 #include "mxtypes.h"
 
-#include <ddraw.h>
 #include <d3drmobj.h>
+#include <ddraw.h>
 
-struct GifData
-{
+struct GifData {
 public:
 	const char* m_name;
 	LPDIRECTDRAWSURFACE m_surface;
@@ -17,8 +16,7 @@ public:
 	MxU8* m_data;
 };
 
-struct GifMapEntry
-{
+struct GifMapEntry {
 public:
 	GifMapEntry* m_right;
 	GifMapEntry* m_parent;
@@ -27,12 +25,12 @@ public:
 	GifData* m_value;
 };
 
-class GifMap
-{
+class GifMap {
 public:
 	GifMapEntry* FindNode(const char*& string);
 
-  inline GifData *Get(const char *string) {
+	inline GifData* Get(const char* string)
+	{
 		GifData* ret = NULL;
 		GifMapEntry* entry = FindNode(string);
 		if (((m_unk4 == entry || strcmp(string, entry->m_key) > 0) ? m_unk4 : entry) != entry)
@@ -45,8 +43,7 @@ public:
 };
 
 // VTABLE 0x100d86d4
-class GifManagerBase 
-{
+class GifManagerBase {
 public:
 	// OFFSET: LEGO1 0x1005a310 STUB
 	virtual ~GifManagerBase() {} // vtable+00
@@ -60,8 +57,7 @@ protected:
 };
 
 // VTABLE 0x100d86fc
-class GifManager : public GifManagerBase 
-{
+class GifManager : public GifManagerBase {
 public:
 	// OFFSET: LEGO1 0x1005a580 STUB
 	virtual ~GifManager() {} // vtable+00

LEGO1/helicopter.cpp

@@ -1,13 +1,78 @@
 #include "helicopter.h"
 
-// OFFSET: LEGO1 0x10001e60 STUB
+#include "act3.h"
+#include "legoanimationmanager.h"
+#include "legocontrolmanager.h"
+#include "legogamestate.h"
+#include "legoomni.h"
+#include "legoutil.h"
+#include "legoworld.h"
+
+DECOMP_SIZE_ASSERT(Helicopter, 0x230)
+
+// OFFSET: LEGO1 0x10001e60
 Helicopter::Helicopter()
 {
-  // TODO
+	m_unk13c = 60;
 }
 
-// OFFSET: LEGO1 0x10003230 STUB
+// OFFSET: LEGO1 0x10003230
 Helicopter::~Helicopter()
 {
-  // TODO
+	ControlManager()->Unregister(this);
+	IslePathActor::Destroy(TRUE);
+}
+
+// OFFSET: LEGO1 0x100032c0
+MxResult Helicopter::InitFromMxDSObject(MxDSObject& p_dsObject)
+{
+	MxResult result = IslePathActor::InitFromMxDSObject(p_dsObject);
+	LegoWorld* world = GetCurrentWorld();
+	SetWorld(world);
+	if (world->IsA("Act3")) {
+		((Act3*) GetWorld())->SetUnkown420c(this);
+	}
+	world = GetWorld();
+	if (world)
+		world->VTable0x58(this);
+	GetState();
+	return result;
+}
+
+// OFFSET: LEGO1 0x10003320
+void Helicopter::GetState()
+{
+	m_state = (HelicopterState*) GameState()->GetState("HelicopterState");
+	if (!m_state)
+		m_state = (HelicopterState*) GameState()->CreateState("HelicopterState");
+}
+
+// OFFSET: LEGO1 0x10003360
+void Helicopter::VTable0xe4()
+{
+	if (!GameState()->GetUnknown10()) {
+		VTable0xe8(0x28, TRUE, 7);
+	}
+	IslePathActor::VTable0xe4();
+	if (!GameState()->GetUnknown10()) {
+		GameState()->SetUnknown424(0x3c);
+		if (GetCurrentVehicle()) {
+			if (GetCurrentVehicle()->IsA("IslePathActor")) {
+				((IslePathActor*) GetCurrentVehicle())->VTable0xe8(0x37, TRUE, 7);
+			}
+		}
+	}
+	m_state->SetUnknown8(0);
+	FUN_1003ee00(m_unk22c, 0x16);
+	FUN_1003ee00(m_unk22c, 0x17);
+	FUN_1003ee00(m_unk22c, 0x18);
+	FUN_1003ee00(m_unk22c, 0x19);
+	FUN_1003ee00(m_unk22c, 0x1a);
+	FUN_1003ee00(m_unk22c, 0x1b);
+	FUN_1003ee00(m_unk22c, 0x1c);
+	FUN_1003ee00(m_unk22c, 0x1d);
+	FUN_1003ee00(m_unk22c, 0x1e);
+	FUN_1003ee00(m_unk22c, 0x1f);
+	AnimationManager()->FUN_1005f6d0(TRUE);
+	ControlManager()->Unregister(this);
 }

LEGO1/helicopter.h

@@ -1,15 +1,15 @@
 #ifndef HELICOPTER_H
 #define HELICOPTER_H
 
+#include "helicopterstate.h"
 #include "islepathactor.h"
+#include "mxmatrix.h"
 
 // VTABLE 0x100d40f8
 // SIZE 0x230
-class Helicopter : public IslePathActor
-{
+class Helicopter : public IslePathActor {
 public:
 	Helicopter();
-  virtual ~Helicopter(); // vtable+0x0
 
 	// OFFSET: LEGO1 0x10003070
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -24,6 +24,25 @@ public:
 		return !strcmp(name, Helicopter::ClassName()) || IslePathActor::IsA(name);
 	}
 
+	virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual void VTable0xe4() override;
+
+	// OFFSET: LEGO1 0x10003210 TEMPLATE
+	// Helicopter::`scalar deleting destructor'
+	virtual ~Helicopter() override; // vtable+0x0
+
+protected:
+	MxMatrixData m_unk160;
+	MxMatrixData m_unk1a8;
+	undefined4 m_unk1f0;
+	MxVector4Data m_unk1f4;
+	MxVector4Data m_unk20c;
+	undefined4 m_unk224;
+	HelicopterState* m_state;
+	MxAtomId m_unk22c;
+
+private:
+	void GetState();
 };
 
 #endif // HELICOPTER_H

LEGO1/helicopterstate.h

@@ -1,12 +1,12 @@
 #ifndef HELICOPTERSTATE_H
 #define HELICOPTERSTATE_H
 
+#include "decomp.h"
 #include "legostate.h"
 
 // VTABLE 0x100d5418
 // SIZE 0xc
-class HelicopterState : public LegoState
-{
+class HelicopterState : public LegoState {
 public:
 	// OFFSET: LEGO1 0x1000e0d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,6 +20,11 @@ public:
 	{
 		return !strcmp(name, HelicopterState::ClassName()) || LegoState::IsA(name);
 	}
+
+	inline void SetUnknown8(undefined4 p_unk8) { m_unk8 = p_unk8; }
+
+protected:
+	undefined4 m_unk8;
 };
 
 #endif // HELICOPTERSTATE_H

LEGO1/historybook.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100da328
 // SIZE 0x3e4
-class HistoryBook : public LegoWorld
-{
+class HistoryBook : public LegoWorld {
 public:
 	HistoryBook();
 	virtual ~HistoryBook() override; // vtable+0x0

LEGO1/hospital.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d9730
 // SIZE 0x12c
-class Hospital : public LegoWorld
-{
+class Hospital : public LegoWorld {
 public:
 	Hospital();
 	virtual ~Hospital() override; // vtable+0x0
@@ -25,7 +24,6 @@ public:
 	{
 		return !strcmp(name, Hospital::ClassName()) || LegoWorld::IsA(name);
 	}
-
 };
 
 #endif // HOSPITAL_H

LEGO1/hospitalentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5068
 // SIZE 0x68
-class HospitalEntity : public BuildingEntity
-{
+class HospitalEntity : public BuildingEntity {
 public:
 	// OFFSET: LEGO1 0x1000ec40
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,7 +19,6 @@ public:
 	{
 		return !strcmp(name, HospitalEntity::ClassName()) || BuildingEntity::IsA(name);
 	}
-
 };
 
 #endif // HOSPITALENTITY_H

LEGO1/hospitalstate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d97a0
 // SIZE 0x18
-class HospitalState : public LegoState
-{
+class HospitalState : public LegoState {
 public:
 	HospitalState();
 
@@ -22,7 +21,6 @@ public:
 	{
 		return !strcmp(name, HospitalState::ClassName()) || LegoState::IsA(name);
 	}
-
 };
 
 #endif // HOSPITALSTATE_H

LEGO1/infocenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d9338
 // SIZE 0x1d8
-class Infocenter : public LegoWorld
-{
+class Infocenter : public LegoWorld {
 public:
 	Infocenter();
 	virtual ~Infocenter() override;
@@ -26,7 +25,6 @@ public:
 	{
 		return !strcmp(name, Infocenter::ClassName()) || LegoWorld::IsA(name);
 	}
-
 };
 
 #endif // INFOCENTER_H

LEGO1/infocenterdoor.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d72d8
 // SIZE 0xfc
-class InfocenterDoor : public LegoWorld
-{
+class InfocenterDoor : public LegoWorld {
 public:
 	InfocenterDoor();
 	virtual ~InfocenterDoor(); // vtable+0x0
@@ -25,7 +24,6 @@ public:
 	{
 		return !strcmp(name, InfocenterDoor::ClassName()) || LegoWorld::IsA(name);
 	}
-
 };
 
 #endif // INFOCENTERDOOR_H

LEGO1/infocenterentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4b90
 // SIZE 0x68
-class InfoCenterEntity : public BuildingEntity
-{
+class InfoCenterEntity : public BuildingEntity {
 public:
 	// OFFSET: LEGO1 0x1000ea00
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,7 +19,6 @@ public:
 	{
 		return !strcmp(name, InfoCenterEntity::ClassName()) || BuildingEntity::IsA(name);
 	}
-
 };
 
 #endif // INFOCENTERENTITY_H

LEGO1/infocenterstate.cpp

@@ -13,4 +13,3 @@ InfocenterState::~InfocenterState()
 {
 	// TODO
 }
-

LEGO1/infocenterstate.h

@@ -1,14 +1,12 @@
 #ifndef INFOCENTERSTATE_H
 #define INFOCENTERSTATE_H
 
-#include "legostate.h"
-
 #include "decomp.h"
+#include "legostate.h"
 
 // VTABLE 0x100d93a8
 // SIZE 0x94
-class InfocenterState : public LegoState
-{
+class InfocenterState : public LegoState {
 public:
 	InfocenterState();
 	virtual ~InfocenterState();

LEGO1/isle.h

@@ -6,8 +6,7 @@
 // VTABLE 0x100d6fb8
 // SIZE 0x140
 // Radio at 0x12c
-class Isle : public LegoWorld
-{
+class Isle : public LegoWorld {
 public:
 	Isle();
 

LEGO1/isleactor.h

@@ -4,8 +4,7 @@
 #include "legoactor.h"
 
 // VTABLE 0x100d5178
-class IsleActor : public LegoActor
-{
+class IsleActor : public LegoActor {
 public:
 	// OFFSET: LEGO1 0x1000e660
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/islepathactor.cpp

@@ -2,6 +2,38 @@
 
 DECOMP_SIZE_ASSERT(IslePathActor, 0x160)
 
+// Probably in header
+// OFFSET: LEGO1 0x10002df0 STUB
+void IslePathActor::VTable0xd0()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002e00 STUB
+void IslePathActor::VTable0xdc()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002e70 STUB
+void IslePathActor::VTable0xcc()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002e80 STUB
+void IslePathActor::VTable0xd4()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002e90 STUB
+void IslePathActor::VTable0xd8()
+{
+	// TODO
+}
+// End header
+
 // OFFSET: LEGO1 0x1001a200
 IslePathActor::IslePathActor()
 {
@@ -11,7 +43,32 @@ IslePathActor::IslePathActor()
 	this->m_unk158 = 0;
 }
 
-// OFFSET: LEGO1 0x10002e10
-IslePathActor::~IslePathActor()
+// OFFSET: LEGO1 0x1001a280
+MxResult IslePathActor::InitFromMxDSObject(MxDSObject& p_dsObject)
 {
+	return MxEntity::InitFromMxDSObject(p_dsObject);
+}
+
+// OFFSET: LEGO1 0x1001a350 STUB
+void IslePathActor::VTable0xe0()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x1001a3f0 STUB
+void IslePathActor::VTable0xe4()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x1001b2a0 STUB
+void IslePathActor::VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3)
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x1001b5b0 STUB
+void IslePathActor::VTable0xec()
+{
+	// TODO
 }

LEGO1/islepathactor.h

@@ -7,11 +7,9 @@
 
 // VTABLE 0x100d4398
 // SIZE 0x160
-class IslePathActor : public LegoPathActor
-{
+class IslePathActor : public LegoPathActor {
 public:
 	IslePathActor();
-  ~IslePathActor();
 
 	// OFFSET: LEGO1 0x10002ea0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -26,6 +24,24 @@ public:
 		return !strcmp(name, IslePathActor::ClassName()) || LegoPathActor::IsA(name);
 	}
 
+	// OFFSET: LEGO1 0x10002ff0 TEMPLATE
+	// IslePathActor::`scalar deleting destructor'
+	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); }
+
+	virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+0x18
+	virtual void VTable0xcc();                                            // vtable+0xcc
+	virtual void VTable0xd0();                                            // vtable+0xd0
+	virtual void VTable0xd4();                                            // vtable+0xd4
+	virtual void VTable0xd8();                                            // vtable+0xd8
+	virtual void VTable0xdc();                                            // vtable+0xdc
+	virtual void VTable0xe0();                                            // vtable+0xe0
+	virtual void VTable0xe4();                                            // vtable+0xe4
+	virtual void VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3);             // vtable+0xe8
+	virtual void VTable0xec();                                            // vtable+0xec
+
+	inline void SetWorld(LegoWorld* p_world) { m_pLegoWorld = p_world; }
+	inline LegoWorld* GetWorld() { return m_pLegoWorld; }
+
 private:
 	LegoWorld* m_pLegoWorld; // 0x154
 	MxFloat m_unk158;

LEGO1/jetski.h

@@ -6,8 +6,7 @@
 
 // VTABLE 0x100d9ec8
 // SIZE 0x164
-class Jetski : public IslePathActor
-{
+class Jetski : public IslePathActor {
 public:
 	Jetski();
 
@@ -23,10 +22,10 @@ public:
 	{
 		return !strcmp(name, Jetski::ClassName()) || IslePathActor::IsA(name);
 	}
+
 private:
 	// TODO: Jetski fields
 	undefined m_unk160[4];
 };
 
-
 #endif // JETSKI_H

LEGO1/jetskirace.h

@@ -5,10 +5,8 @@
 
 // VTABLE 0x100d4fe8
 // SIZE 0x144
-class JetskiRace : public LegoRace
-{
+class JetskiRace : public LegoRace {
 public:
-
 	// OFFSET: LEGO1 0x1000daf0
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{

LEGO1/jetskiracestate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4fa8
 // SIZE 0x2c
-class JetskiRaceState : public RaceState
-{
+class JetskiRaceState : public RaceState {
 public:
 	// OFFSET: LEGO1 0x1000dc40
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,7 +19,6 @@ public:
 	{
 		return !strcmp(name, JetskiRaceState::ClassName()) || RaceState::IsA(name);
 	}
-
 };
 
 #endif // JETSKIRACESTATE_H

LEGO1/jukebox.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d8958
 // SIZE 0x104
-class JukeBox : public LegoWorld
-{
+class JukeBox : public LegoWorld {
 public:
 	JukeBox();
 
@@ -22,7 +21,6 @@ public:
 	{
 		return !strcmp(name, JukeBox::ClassName()) || LegoWorld::IsA(name);
 	}
-  
 };
 
 #endif // JUKEBOX_H

LEGO1/jukeboxentity.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100da8a0
 // SIZE 0x6c
-class JukeBoxEntity : public LegoEntity
-{
+class JukeBoxEntity : public LegoEntity {
 public:
 	JukeBoxEntity();
 	virtual ~JukeBoxEntity() override; // vtable+0x0
@@ -23,7 +22,6 @@ public:
 	{
 		return !strcmp(name, JukeBoxEntity::ClassName()) || LegoEntity::IsA(name);
 	}
-
 };
 
 #endif // JUKEBOXENTITY_H

LEGO1/jukeboxstate.cpp

@@ -1,6 +1,7 @@
 #include "jukeboxstate.h"
 
 // OFFSET: LEGO1 0x1000f300
-MxBool JukeBoxState::VTable0x14() {
+MxBool JukeBoxState::VTable0x14()
+{
 	return FALSE;
 }

LEGO1/jukeboxstate.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4a90
 // SIZE 0x10
-class JukeBoxState : public LegoState
-{
+class JukeBoxState : public LegoState {
 public:
 	// OFFSET: LEGO1 0x1000f310
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -22,7 +21,6 @@ public:
 	}
 
 	virtual MxBool VTable0x14() override; // vtable+0x14
-
 };
 
 #endif // JUKEBOXSTATE_H

LEGO1/lego3dmanager.h

@@ -3,8 +3,7 @@
 
 #include "lego3dview.h"
 
-class Lego3DManager
-{
+class Lego3DManager {
 public:
 	inline Lego3DView* GetLego3DView() { return this->m_3dView; }
 

LEGO1/lego3dview.h

@@ -3,8 +3,7 @@
 
 #include "viewmanager.h"
 
-class Lego3DView
-{
+class Lego3DView {
 public:
 	inline ViewManager* GetViewManager() { return this->m_viewManager; }
 

LEGO1/lego3dwavepresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d52b0
 // SIZE 0xa0
-class Lego3DWavePresenter : public LegoWavePresenter
-{
+class Lego3DWavePresenter : public LegoWavePresenter {
 public:
 	// OFFSET: LEGO1 0x1000d890
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/legoact2state.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4a70
 // SIZE 0x10
-class LegoAct2State : public LegoState
-{
+class LegoAct2State : public LegoState {
 public:
 	// OFFSET: LEGO1 0x1000df80
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -20,7 +19,6 @@ public:
 	{
 		return !strcmp(name, LegoAct2State::ClassName()) || LegoState::IsA(name);
 	}
-
 };
 
 #endif // LEGOACT2STATE_H

LEGO1/legoactioncontrolpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5118
 // SIZE 0x68
-class LegoActionControlPresenter : public MxMediaPresenter
-{
+class LegoActionControlPresenter : public MxMediaPresenter {
 public:
 	// OFFSET: LEGO1 0x1000d0e0
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/legoactor.cpp

@@ -2,7 +2,44 @@
 
 DECOMP_SIZE_ASSERT(LegoActor, 0x78)
 
-// OFFSET: LEGO1 0x1002d110 STUB
+// Probably in header
+// OFFSET: LEGO1 0x10002cc0 STUB
+void LegoActor::VTable0x50()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002cd0 STUB
+void LegoActor::VTable0x54()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002ce0 STUB
+void LegoActor::VTable0x58()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002cf0 STUB
+void LegoActor::VTable0x5c()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002d00 STUB
+void LegoActor::VTable0x60()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x10002d10 STUB
+void LegoActor::VTable0x64()
+{
+	// TODO
+}
+// End header
+
 LegoActor::LegoActor()
 {
 }

LEGO1/legoactor.h

@@ -6,8 +6,7 @@
 
 // VTABLE 0x100d6d68
 // SIZE 0x78
-class LegoActor : public LegoEntity
-{
+class LegoActor : public LegoEntity {
 public:
 	LegoActor();
 
@@ -24,9 +23,15 @@ public:
 		return !strcmp(name, LegoActor::ClassName()) || LegoEntity::IsA(name);
 	}
 
+	virtual void VTable0x50(); // vtable+0x50
+	virtual void VTable0x54(); // vtable+0x54
+	virtual void VTable0x58(); // vtable+0x58
+	virtual void VTable0x5c(); // vtable+0x5c
+	virtual void VTable0x60(); // vtable+0x60
+	virtual void VTable0x64(); // vtable+0x64
+
 private:
 	undefined unk68[0x10];
-
 };
 
 #endif // LEGOACTOR_H

LEGO1/legoactorpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5320
 // SIZE 0x50
-class LegoActorPresenter : public LegoEntityPresenter
-{
+class LegoActorPresenter : public LegoEntityPresenter {
 public:
 	// OFFSET: LEGO1 0x1000cb10
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/legoanimactor.h

@@ -3,8 +3,7 @@
 
 #include "legopathactor.h"
 
-class LegoAnimActor : public LegoPathActor
-{
+class LegoAnimActor : public LegoPathActor {
 public:
 };
 

LEGO1/legoanimationmanager.cpp

@@ -3,9 +3,16 @@
 // 0x100f74f8
 int g_legoAnimationManagerConfig = 1;
 
+// OFFSET: LEGO1 0x1005eb50
+void LegoAnimationManager::configureLegoAnimationManager(int param_1)
+{
+	g_legoAnimationManagerConfig = param_1;
+}
+
 // OFFSET: LEGO1 0x1005eb60 STUB
 LegoAnimationManager::LegoAnimationManager()
 {
+	// TODO
 }
 
 // OFFSET: LEGO1 0x1005ed30 STUB
@@ -14,6 +21,18 @@ LegoAnimationManager::~LegoAnimationManager()
 	// TODO
 }
 
+// OFFSET: LEGO1 0x1005f130 STUB
+void LegoAnimationManager::Init()
+{
+	// TODO
+}
+
+// OFFSET: LEGO1 0x1005f6d0 STUB
+void LegoAnimationManager::FUN_1005f6d0(MxBool p)
+{
+	// TODO
+}
+
 // OFFSET: LEGO1 0x100619f0 STUB
 MxLong LegoAnimationManager::Notify(MxParam& p)
 {
@@ -29,15 +48,3 @@ MxResult LegoAnimationManager::Tickle()
 
 	return SUCCESS;
 }
-
-// OFFSET: LEGO1 0x1005f130 STUB
-void LegoAnimationManager::Init()
-{
-  // TODO
-}
-
-// OFFSET: LEGO1 0x1005eb50
-void LegoAnimationManager::configureLegoAnimationManager(int param_1)
-{
-  g_legoAnimationManagerConfig = param_1;
-}

LEGO1/legoanimationmanager.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d8c18
 // SIZE 0x500
-class LegoAnimationManager : public MxCore
-{
+class LegoAnimationManager : public MxCore {
 public:
 	LegoAnimationManager();
 	virtual ~LegoAnimationManager() override; // vtable+0x0
@@ -27,11 +26,12 @@ public:
 		return !strcmp(name, ClassName()) || MxCore::IsA(name);
 	}
 
+	void FUN_1005f6d0(MxBool p);
+
 	__declspec(dllexport) static void configureLegoAnimationManager(int param_1);
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOANIMATIONMANAGER_H

LEGO1/legoanimmmpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d7de8
 // SIZE 0x74
-class LegoAnimMMPresenter : public MxCompositePresenter
-{
+class LegoAnimMMPresenter : public MxCompositePresenter {
 public:
 	LegoAnimMMPresenter();
 
@@ -22,7 +21,6 @@ public:
 	{
 		return !strcmp(name, LegoAnimMMPresenter::ClassName()) || MxCompositePresenter::IsA(name);
 	}
-
 };
 
 #endif // LEGOANIMMMPRESENTER_H

LEGO1/legoanimpresenter.h

@@ -4,8 +4,7 @@
 #include "mxvideopresenter.h"
 
 // VTABLE 0x100d90c8
-class LegoAnimPresenter : public MxVideoPresenter
-{
+class LegoAnimPresenter : public MxVideoPresenter {
 public:
 	LegoAnimPresenter();
 
@@ -24,7 +23,6 @@ public:
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOANIMPRESENTER_H

LEGO1/legobackgroundcolor.cpp

@@ -1,9 +1,9 @@
 #include "legobackgroundcolor.h"
 
+#include "decomp.h"
 #include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
-#include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoBackgroundColor, 0x30)
 

LEGO1/legobackgroundcolor.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d74a8
 // SIZE 0x30
-class LegoBackgroundColor : public MxVariable
-{
+class LegoBackgroundColor : public MxVariable {
 public:
 	__declspec(dllexport) LegoBackgroundColor(const char* p_key, const char* p_value);
 	virtual void SetValue(const char* p_colorString) override;

LEGO1/legobuildingmanager.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d6f50
 // SIZE 0x30
-class LegoBuildingManager : public MxCore
-{
+class LegoBuildingManager : public MxCore {
 public:
 	LegoBuildingManager();
 	virtual ~LegoBuildingManager() override;
@@ -22,7 +21,6 @@ public:
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOBUILDINGMANAGER_H

LEGO1/legocachesound.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4718
 // SIZE 0x88
-class LegoCacheSound : public MxCore
-{
+class LegoCacheSound : public MxCore {
 public:
 	LegoCacheSound();
 	virtual ~LegoCacheSound() override; // vtable+0x0

LEGO1/legocameracontroller.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d57b0
 // SIZE 0xc8
-class LegoCameraController : public MxCore
-{
+class LegoCameraController : public MxCore {
 public:
 	LegoCameraController();
 	virtual ~LegoCameraController() override; // vtable+0x0
@@ -23,7 +22,6 @@ public:
 	{
 		return !strcmp(name, ClassName()) || MxCore::IsA(name);
 	}
-
 };
 
 #endif // LEGOCAMERACONTROLLER_H

LEGO1/legocarbuild.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d6658
 // SIZE 0x34c
-class LegoCarBuild : public LegoWorld
-{
+class LegoCarBuild : public LegoWorld {
 public:
 	LegoCarBuild();
 	virtual ~LegoCarBuild() override;

LEGO1/legocarbuildanimpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d99e0
 // SIZE 0x150
-class LegoCarBuildAnimPresenter : public LegoAnimPresenter
-{
+class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 public:
 	LegoCarBuildAnimPresenter();
 	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x0

LEGO1/legocarraceactor.h

@@ -4,8 +4,7 @@
 #include "legoraceactor.h"
 
 // VTABLE 0x100da0d8
-class LegoCarRaceActor : public LegoRaceActor
-{
+class LegoCarRaceActor : public LegoRaceActor {
 public:
 	// OFFSET: LEGO1 0x10081650
 	inline virtual const char* ClassName() const override // vtable+0x0c

LEGO1/legocontrolmanager.h

@@ -4,8 +4,7 @@
 #include "mxcore.h"
 
 // VTABLE 0x100d6a80
-class LegoControlManager : public MxCore
-{
+class LegoControlManager : public MxCore {
 public:
 	LegoControlManager();
 	virtual ~LegoControlManager() override; // vtable+0x0

LEGO1/legoentity.cpp

@@ -1,8 +1,8 @@
 #include "legoentity.h"
 
+#include "define.h"
 #include "legoomni.h"
 #include "legoutil.h"
-#include "define.h"
 
 DECOMP_SIZE_ASSERT(LegoEntity, 0x68)
 
@@ -60,8 +60,7 @@ void LegoEntity::Destroy(MxBool p_fromDestructor)
 void LegoEntity::AddToCurrentWorld()
 {
 	LegoWorld* world = GetCurrentWorld();
-  if (world != NULL && world != (LegoWorld*)this)
-  {
+	if (world != NULL && world != (LegoWorld*) this) {
 		// TODO: world->vtable58(this);
 	}
 }

LEGO1/legoentity.h

@@ -1,16 +1,15 @@
 #ifndef LEGOENTITY_H
 #define LEGOENTITY_H
 
+#include "decomp.h"
+#include "extra.h"
+#include "mxdsobject.h"
 #include "mxentity.h"
 #include "mxvector.h"
-#include "extra.h"
-#include "decomp.h"
-#include "mxdsobject.h"
 
 // VTABLE 0x100d4858
 // SIZE 0x68 (probably)
-class LegoEntity : public MxEntity
-{
+class LegoEntity : public MxEntity {
 public:
 	// Inlined at 0x100853f7
 	inline LegoEntity()

LEGO1/legoentitypresenter.cpp

@@ -12,7 +12,7 @@ LegoEntityPresenter::~LegoEntityPresenter()
 	// TODO
 }
 
-// OFFSET: LEG01 0x100535c0 STUB
+// OFFSET: LEGO1 0x100535c0 STUB
 void LegoEntityPresenter::Init()
 {
 	// TODO

LEGO1/legoentitypresenter.h

@@ -4,8 +4,7 @@
 #include "mxcompositepresenter.h"
 
 // VTABLE 0x100d8398
-class LegoEntityPresenter : public MxCompositePresenter
-{
+class LegoEntityPresenter : public MxCompositePresenter {
 public:
 	LegoEntityPresenter();
 	virtual ~LegoEntityPresenter() override; // vtable+0x0
@@ -25,8 +24,6 @@ public:
 
 private:
 	void Init();
-  
 };
 
-
 #endif // LEGOENTITYPRESENTER_H

LEGO1/legoextraactor.h

@@ -4,8 +4,7 @@
 #include "legoanimactor.h"
 
 // VTABLE 0x100d6c10
-class LegoExtraActor : public LegoAnimActor
-{
+class LegoExtraActor : public LegoAnimActor {
 public:
 	// OFFSET: LEGO1 0x1002b7a0
 	inline const char* ClassName() const override // vtable+0xc

LEGO1/legoflctexturepresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d89e0
 // SIZE 0x70
-class LegoFlcTexturePresenter : public MxFlcPresenter
-{
+class LegoFlcTexturePresenter : public MxFlcPresenter {
 public:
 	LegoFlcTexturePresenter();
 
@@ -16,7 +15,6 @@ public:
 		// 0x100f0634
 		return "LegoFlcTexturePresenter";
 	}
-
 };
 
 #endif // LEGOFLCTEXTUREPRESENTER_H

LEGO1/legofullscreenmovie.cpp

@@ -1,9 +1,9 @@
 #include "legofullscreenmovie.h"
 
+#include "decomp.h"
 #include "legoomni.h"
 #include "legovideomanager.h"
 #include "mxtypes.h"
-#include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoFullScreenMovie, 0x24)
 

LEGO1/legofullscreenmovie.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d74b8
 // SIZE 0x24
-class LegoFullScreenMovie : public MxVariable
-{
+class LegoFullScreenMovie : public MxVariable {
 public:
 	LegoFullScreenMovie(const char* p_key, const char* p_value);
 	virtual void SetValue(const char* p_option) override;

LEGO1/legogamestate.cpp

@@ -1,12 +1,12 @@
 #include "legogamestate.h"
 
+#include "infocenterstate.h"
 #include "legoomni.h"
 #include "legostate.h"
-#include "infocenterstate.h"
 #include "legostream.h"
 #include "mxobjectfactory.h"
-#include "mxvariabletable.h"
 #include "mxstring.h"
+#include "mxvariabletable.h"
 
 // Based on the highest dword offset (0x42c) referenced in the constructor.
 // There may be other members that come after.
@@ -17,48 +17,20 @@ const char *g_fileExtensionGS = ".GS";
 
 // GLOBAL OFFSET: LEGO1 0x100f3e58
 ColorStringStruct g_colorSaveData[43] = {
-  {"c_dbbkfny0", "lego red"},
-  {"c_dbbkxly0", "lego white"},
-  {"c_chbasey0", "lego black"},
-  {"c_chbacky0", "lego black"},
-  {"c_chdishy0", "lego white"},
-  {"c_chhorny0", "lego black"},
-  {"c_chljety1", "lego black"},
-  {"c_chrjety1", "lego black"},
-  {"c_chmidly0", "lego black"},
-  {"c_chmotry0", "lego blue"},
-  {"c_chsidly0", "lego black"},
-  {"c_chsidry0", "lego black"},
-  {"c_chstuty0", "lego black"},
-  {"c_chtaily0", "lego black"},
-  {"c_chwindy1", "lego black"},
-  {"c_dbfbrdy0", "lego red"},
-  {"c_dbflagy0", "lego yellow"},
-  {"c_dbfrfny4", "lego red"},
-  {"c_dbfrxly0", "lego white"},
-  {"c_dbhndly0", "lego white"},
-  {"c_dbltbry0", "lego white"},
-  {"c_jsdashy0", "lego white"},
-  {"c_jsexhy0",  "lego black"},
-  {"c_jsfrnty5", "lego black"},
-  {"c_jshndly0", "lego red"},
-  {"c_jslsidy0", "lego black"},
-  {"c_jsrsidy0", "lego black"},
-  {"c_jsskiby0", "lego red"},
-  {"c_jswnshy5", "lego white"},
-  {"c_rcbacky6", "lego green"},
-  {"c_rcedgey0", "lego green"},
-  {"c_rcfrmey0", "lego red"},
-  {"c_rcfrnty6", "lego green"},
-  {"c_rcmotry0", "lego white"},
-  {"c_rcsidey0", "lego green"},
-  {"c_rcstery0", "lego white"},
-  {"c_rcstrpy0", "lego yellow"},
-  {"c_rctailya", "lego white"},
-  {"c_rcwhl1y0", "lego white"},
-  {"c_rcwhl2y0", "lego white"},
-  {"c_jsbasey0", "lego white"},
-  {"c_chblady0", "lego black"},
+	{"c_dbbkfny0", "lego red"},    {"c_dbbkxly0", "lego white"},  {"c_chbasey0", "lego black"},
+	{"c_chbacky0", "lego black"},  {"c_chdishy0", "lego white"},  {"c_chhorny0", "lego black"},
+	{"c_chljety1", "lego black"},  {"c_chrjety1", "lego black"},  {"c_chmidly0", "lego black"},
+	{"c_chmotry0", "lego blue"},   {"c_chsidly0", "lego black"},  {"c_chsidry0", "lego black"},
+	{"c_chstuty0", "lego black"},  {"c_chtaily0", "lego black"},  {"c_chwindy1", "lego black"},
+	{"c_dbfbrdy0", "lego red"},    {"c_dbflagy0", "lego yellow"}, {"c_dbfrfny4", "lego red"},
+	{"c_dbfrxly0", "lego white"},  {"c_dbhndly0", "lego white"},  {"c_dbltbry0", "lego white"},
+	{"c_jsdashy0", "lego white"},  {"c_jsexhy0", "lego black"},   {"c_jsfrnty5", "lego black"},
+	{"c_jshndly0", "lego red"},    {"c_jslsidy0", "lego black"},  {"c_jsrsidy0", "lego black"},
+	{"c_jsskiby0", "lego red"},    {"c_jswnshy5", "lego white"},  {"c_rcbacky6", "lego green"},
+	{"c_rcedgey0", "lego green"},  {"c_rcfrmey0", "lego red"},    {"c_rcfrnty6", "lego green"},
+	{"c_rcmotry0", "lego white"},  {"c_rcsidey0", "lego green"},  {"c_rcstery0", "lego white"},
+	{"c_rcstrpy0", "lego yellow"}, {"c_rctailya", "lego white"},  {"c_rcwhl1y0", "lego white"},
+	{"c_rcwhl2y0", "lego white"},  {"c_jsbasey0", "lego white"},  {"c_chblady0", "lego black"},
 	{"c_chseaty0", "lego white"},
 };
 
@@ -192,7 +164,7 @@ void LegoGameState::SetSavePath(char *p_savePath)
 }
 
 // OFFSET: LEGO1 0x1003bbb0
-LegoState *LegoGameState::GetState(char *p_stateName)
+LegoState* LegoGameState::GetState(COMPAT_CONST char* p_stateName)
 {
 	for (MxS32 i = 0; i < m_stateCount; ++i)
 		if (m_stateArray[i]->IsA(p_stateName))
@@ -201,7 +173,7 @@ LegoState *LegoGameState::GetState(char *p_stateName)
 }
 
 // OFFSET: LEGO1 0x1003bc00
-LegoState *LegoGameState::CreateState(char *p_stateName)
+LegoState* LegoGameState::CreateState(COMPAT_CONST char* p_stateName)
 {
 	LegoState* newState = (LegoState*) ObjectFactory()->Create(p_stateName);
 	RegisterState(newState);

LEGO1/legogamestate.h

@@ -2,24 +2,22 @@
 #define LEGOGAMESTATE_H
 
 #include "decomp.h"
-#include "mxtypes.h"
 #include "legobackgroundcolor.h"
 #include "legofullscreenmovie.h"
+#include "mxtypes.h"
 
 class LegoState;
 class LegoStream;
 class MxVariable;
 class MxString;
 
-struct ColorStringStruct
-{
+struct ColorStringStruct {
 	const char* m_targetName;
 	const char* m_colorName;
 };
 
 // SIZE 0x430 (at least)
-class LegoGameState
-{
+class LegoGameState {
 public:
 	__declspec(dllexport) LegoGameState();
 	__declspec(dllexport) ~LegoGameState();
@@ -29,13 +27,14 @@ public:
 	__declspec(dllexport) void SerializeScoreHistory(MxS16 p);
 	__declspec(dllexport) void SetSavePath(char* p);
 
-  LegoState *GetState(char *p_stateName);
-  LegoState *CreateState(char *p_stateName);
+	LegoState* GetState(COMPAT_CONST char* p_stateName);
+	LegoState* CreateState(COMPAT_CONST char* p_stateName);
 
 	void GetFileSavePath(MxString* p_outPath, MxULong p_slotn);
 	void FUN_1003a720(MxU32 p_unk);
 	void HandleAction(MxU32 p_unk);
 
+	inline MxU32 GetUnknown10() { return m_unk10; }
 	inline void SetUnknown424(undefined4 p_unk424) { m_unk424 = p_unk424; }
 
 private:

LEGO1/legohideanimpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d9278
 // SIZE 0xc4
-class LegoHideAnimPresenter : public LegoLoopingAnimPresenter
-{
+class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoHideAnimPresenter();
 
@@ -25,7 +24,6 @@ public:
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOHIDEANIMPRESENTER_H

LEGO1/legoinputmanager.cpp

@@ -1,7 +1,7 @@
 #include "legoinputmanager.h"
+
 #include "legocontrolmanager.h"
 #include "legoomni.h"
-
 #include "mxautolocker.h"
 
 DECOMP_SIZE_ASSERT(LegoInputManager, 0x338);
@@ -105,7 +105,8 @@ MxResult LegoInputManager::GetJoystickId()
 			joyinfoex.dwSize = 0x34;
 			joyinfoex.dwFlags = 0xFF;
 
-      if (joyGetPosEx(joyid, &joyinfoex) == JOYERR_NOERROR && joyGetDevCaps(joyid, &m_joyCaps, 0x194) == JOYERR_NOERROR) {
+			if (joyGetPosEx(joyid, &joyinfoex) == JOYERR_NOERROR &&
+				joyGetDevCaps(joyid, &m_joyCaps, 0x194) == JOYERR_NOERROR) {
 				m_joyid = joyid;
 				return SUCCESS;
 			}
@@ -114,7 +115,8 @@ MxResult LegoInputManager::GetJoystickId()
 		for (joyid = JOYSTICKID1; joyid < 16; joyid++) {
 			joyinfoex.dwSize = 0x34;
 			joyinfoex.dwFlags = 0xFF;
-      if (joyGetPosEx(joyid, &joyinfoex) == JOYERR_NOERROR && joyGetDevCaps(joyid, &m_joyCaps, 0x194) == JOYERR_NOERROR) {
+			if (joyGetPosEx(joyid, &joyinfoex) == JOYERR_NOERROR &&
+				joyGetDevCaps(joyid, &m_joyCaps, 0x194) == JOYERR_NOERROR) {
 				m_joyid = joyid;
 				return SUCCESS;
 			}
@@ -125,7 +127,12 @@ MxResult LegoInputManager::GetJoystickId()
 }
 
 // OFFSET: LEGO1 0x1005c320
-MxResult LegoInputManager::GetJoystickState(MxU32 *joystick_x, MxU32 *joystick_y, DWORD *buttons_state, MxU32 *pov_position)
+MxResult LegoInputManager::GetJoystickState(
+	MxU32* joystick_x,
+	MxU32* joystick_y,
+	DWORD* buttons_state,
+	MxU32* pov_position
+)
 {
 	if (m_useJoystick != FALSE) {
 		if (m_joyid < 0 && GetJoystickId() == -1) {

LEGO1/legoinputmanager.h

@@ -3,13 +3,12 @@
 
 #include "decomp.h"
 #include "legoworld.h"
-#include "mxpresenter.h"
 #include "mxlist.h"
+#include "mxpresenter.h"
 
 #include <dinput.h>
 
-enum NotificationId
-{
+enum NotificationId {
 	NONE = 0,
 	KEYDOWN = 7,
 	MOUSEUP = 8,
@@ -22,8 +21,7 @@ class LegoControlManager;
 
 // VTABLE 0x100d8760
 // SIZE 0x338
-class LegoInputManager : public MxPresenter
-{
+class LegoInputManager : public MxPresenter {
 public:
 	LegoInputManager();
 	virtual ~LegoInputManager() override;

LEGO1/legojetski.h

@@ -4,8 +4,7 @@
 #include "legojetskiraceactor.h"
 
 // VTABLE 0x100d5a40
-class LegoJetski : public LegoJetskiRaceActor
-{
+class LegoJetski : public LegoJetskiRaceActor {
 public:
 	// OFFSET: LEGO1 0x10013e80
 	inline const char* ClassName() const override // vtable+0xc
@@ -19,8 +18,6 @@ public:
 	{
 		return !strcmp(name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(name);
 	}
-
 };
 
-
 #endif // LEGOJETSKI_H

LEGO1/legojetskiraceactor.h

@@ -4,8 +4,7 @@
 #include "legocarraceactor.h"
 
 // VTABLE 0x100da240
-class LegoJetskiRaceActor : public LegoCarRaceActor
-{
+class LegoJetskiRaceActor : public LegoCarRaceActor {
 public:
 	// OFFSET: LEGO1 0x10081d80
 	inline const char* ClassName() const override // vtable+0xc

LEGO1/legoloadcachesoundpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d5fa8
 // SIZE 0x90
-class LegoLoadCacheSoundPresenter : public MxWavePresenter
-{
+class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 public:
 	LegoLoadCacheSoundPresenter();
 	virtual ~LegoLoadCacheSoundPresenter() override;
@@ -20,7 +19,6 @@ public:
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOLOADCACHESOUNDPRESENTER_H

LEGO1/legolocomotionanimpresenter.h

@@ -4,8 +4,7 @@
 #include "legoloopinganimpresenter.h"
 
 // VTABLE 0x100d9170
-class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter
-{
+class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 public:
 	LegoLocomotionAnimPresenter();
 
@@ -24,7 +23,6 @@ public:
 
 private:
 	void Init();
-
 };
 
 #endif // LEGOLOCOMOTIONANIMPRESENTER_H

LEGO1/legoloopinganimpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d4900
 // SIZE 0xc0 (discovered through inlined constructor at 0x10009ecd)
-class LegoLoopingAnimPresenter : public LegoAnimPresenter
-{
+class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
 	// OFFSET: LEGO1 0x1000c9a0
 	inline const char* ClassName() const override // vtable+0xc

LEGO1/legometerpresenter.h

@@ -5,8 +5,7 @@
 
 // VTABLE 0x100d7ac8
 // SIZE 0x94 (from 0x1000a163)
-class LegoMeterPresenter : public MxStillPresenter
-{
+class LegoMeterPresenter : public MxStillPresenter {
 public:
 	// MxStillPresenter's `::ClassName` and `::IsA` are used.
 };