From 4371387826ae9ddb98d112ffc704aeb3dd6d31b6 Mon Sep 17 00:00:00 2001
From: disinvite <disinvite@users.noreply.github.com>
Date: Thu, 27 Jun 2024 11:42:39 -0400
Subject: [PATCH] LegoDeviceEnumerate

---
 CONFIG/config.cpp                             |  2 +-
 CONFIG/config.h                               | 36 +++++++++----------
 .../legoomni/src/video/legovideomanager.cpp   |  2 +-
 LEGO1/mxdirectx/mxdirectxinfo.h               |  7 ++--
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp
index 4e1a2264..59c03332 100644
--- a/CONFIG/config.cpp
+++ b/CONFIG/config.cpp
@@ -47,7 +47,7 @@ BOOL CConfigApp::InitInstance()
 	if (_stricmp(afxCurrentAppName, "config") == 0) {
 		m_run_config_dialog = TRUE;
 	}
-	m_device_enumerator = new MxDeviceEnumerate;
+	m_device_enumerator = new LegoDeviceEnumerate;
 	if (m_device_enumerator->DoEnumerate()) {
 		return FALSE;
 	}
diff --git a/CONFIG/config.h b/CONFIG/config.h
index 63f88eaa..9172e2d5 100644
--- a/CONFIG/config.h
+++ b/CONFIG/config.h
@@ -7,7 +7,7 @@
 
 #include <d3d.h>
 
-class MxDeviceEnumerate;
+class LegoDeviceEnumerate;
 struct Direct3DDeviceInfo;
 struct MxDriver;
 
@@ -54,23 +54,23 @@ class CConfigApp : public CWinApp {
 	BOOL IsLegoNotRunning();
 
 public:
-	MxDeviceEnumerate* m_device_enumerator; // 0x0c4
-	MxDriver* m_driver;                     // 0x0c8
-	Direct3DDeviceInfo* m_device;           // 0x0cc
-	int m_display_bit_depth;                // 0x0d0
-	BOOL m_flip_surfaces;                   // 0x0d4
-	BOOL m_full_screen;                     // 0x0d8
-	BOOL m_3d_video_ram;                    // 0x0dc
-	BOOL m_wide_view_angle;                 // 0x0e0
-	BOOL m_3d_sound;                        // 0x0e4
-	BOOL m_draw_cursor;                     // 0x0e8
-	BOOL m_use_joystick;                    // 0x0ec
-	int m_joystick_index;                   // 0x0f0
-	BOOL m_run_config_dialog;               // 0x0f4
-	int m_model_quality;                    // 0x0f8
-	int m_texture_quality;                  // 0x0fc
-	undefined m_unk0x100[4];                // 0x100
-	BOOL m_music;                           // 0x104
+	LegoDeviceEnumerate* m_device_enumerator; // 0x0c4
+	MxDriver* m_driver;                       // 0x0c8
+	Direct3DDeviceInfo* m_device;             // 0x0cc
+	int m_display_bit_depth;                  // 0x0d0
+	BOOL m_flip_surfaces;                     // 0x0d4
+	BOOL m_full_screen;                       // 0x0d8
+	BOOL m_3d_video_ram;                      // 0x0dc
+	BOOL m_wide_view_angle;                   // 0x0e0
+	BOOL m_3d_sound;                          // 0x0e4
+	BOOL m_draw_cursor;                       // 0x0e8
+	BOOL m_use_joystick;                      // 0x0ec
+	int m_joystick_index;                     // 0x0f0
+	BOOL m_run_config_dialog;                 // 0x0f4
+	int m_model_quality;                      // 0x0f8
+	int m_texture_quality;                    // 0x0fc
+	undefined m_unk0x100[4];                  // 0x100
+	BOOL m_music;                             // 0x104
 };
 
 // SYNTHETIC: CONFIG 0x00402cd0
diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
index d1767f16..0eae0878 100644
--- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
+++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp
@@ -75,7 +75,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
 	MxS32 deviceNum = -1;
 	Direct3DDeviceInfo* device = NULL;
 	MxDriver* driver = NULL;
-	MxDeviceEnumerate100d9cc8 deviceEnumerate;
+	LegoDeviceEnumerate deviceEnumerate;
 	Mx3DPointFloat posVec(0.0, 1.25, -50.0);
 	Mx3DPointFloat dirVec(0.0, 0.0, 1.0);
 	Mx3DPointFloat upVec(0.0, 1.0, 0.0);
diff --git a/LEGO1/mxdirectx/mxdirectxinfo.h b/LEGO1/mxdirectx/mxdirectxinfo.h
index 1a6061dc..d9279670 100644
--- a/LEGO1/mxdirectx/mxdirectxinfo.h
+++ b/LEGO1/mxdirectx/mxdirectxinfo.h
@@ -256,17 +256,18 @@ class MxDeviceEnumerate {
 	unsigned char m_initialized; // 0x10
 };
 
+// VTABLE: CONFIG 0x4060e4
 // VTABLE: LEGO1 0x100d9cc8
 // VTABLE: BETA10 0x101befb4
 // SIZE 0x14
-class MxDeviceEnumerate100d9cc8 : public MxDeviceEnumerate {};
+class LegoDeviceEnumerate : public MxDeviceEnumerate {};
 
 // SYNTHETIC: BETA10 0x100d8d10
-// MxDeviceEnumerate100d9cc8::MxDeviceEnumerate100d9cc8
+// LegoDeviceEnumerate::LegoDeviceEnumerate
 
 // SYNTHETIC: LEGO1 0x1007b590
 // SYNTHETIC: BETA10 0x100d8da0
-// MxDeviceEnumerate100d9cc8::~MxDeviceEnumerate100d9cc8
+// LegoDeviceEnumerate::~LegoDeviceEnumerate
 
 // TEMPLATE: BETA10 0x1011c1b0
 // list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::iterator::operator*