From d67318e78b5a2fe382843786abd4cea1280cc55b Mon Sep 17 00:00:00 2001 From: Erik Schulze <30333186+estchd@users.noreply.github.com> Date: Mon, 19 May 2025 21:25:52 +0200 Subject: [PATCH] propagate name changes from commit fce97ea (#1508) * propagate name changes from commit fce97ea * remove dependency on omni types * rename parameter too --- ISLE/isleapp.cpp | 8 ++++---- ISLE/isleapp.h | 2 +- LEGO1/lego/legoomni/src/video/legovideomanager.cpp | 2 +- LEGO1/viewmanager/viewroi.cpp | 8 ++++---- LEGO1/viewmanager/viewroi.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 78c3cb12..3f5f485a 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -87,7 +87,7 @@ IsleApp::IsleApp() m_backBuffersInVram = TRUE; m_using8bit = FALSE; m_using16bit = TRUE; - m_unk0x24 = 0; + m_hasLightSupport = FALSE; m_drawCursor = FALSE; m_use3dSound = TRUE; m_useMusic = TRUE; @@ -209,7 +209,7 @@ void IsleApp::SetupVideoFlags( BOOL backBuffers, BOOL using8bit, BOOL using16bit, - BOOL param_6, + BOOL hasLightSupport, BOOL param_7, BOOL wideViewAngle, char* deviceId @@ -218,7 +218,7 @@ void IsleApp::SetupVideoFlags( m_videoParam.Flags().SetFullScreen(fullScreen); m_videoParam.Flags().SetFlipSurfaces(flipSurfaces); m_videoParam.Flags().SetBackBuffers(!backBuffers); - m_videoParam.Flags().SetLacksLightSupport(!param_6); + m_videoParam.Flags().SetLacksLightSupport(!hasLightSupport); m_videoParam.Flags().SetF1bit7(param_7); m_videoParam.Flags().SetWideViewAngle(wideViewAngle); m_videoParam.Flags().SetF2bit1(1); @@ -550,7 +550,7 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine) m_backBuffersInVram, m_using8bit, m_using16bit, - m_unk0x24, + m_hasLightSupport, FALSE, m_wideViewAngle, m_deviceId diff --git a/ISLE/isleapp.h b/ISLE/isleapp.h index 6a8289ce..0e8ad0e5 100644 --- a/ISLE/isleapp.h +++ b/ISLE/isleapp.h @@ -56,7 +56,7 @@ private: BOOL m_backBuffersInVram; // 0x18 BOOL m_using8bit; // 0x1c BOOL m_using16bit; // 0x20 - int m_unk0x24; // 0x24 + BOOL m_hasLightSupport; // 0x24 BOOL m_use3dSound; // 0x28 BOOL m_useMusic; // 0x2c BOOL m_useJoystick; // 0x30 diff --git a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp index bc8fa1cb..82430bcb 100644 --- a/LEGO1/lego/legoomni/src/video/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -132,7 +132,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM p_videoParam.Flags().SetLacksLightSupport(FALSE); } - ViewROI::SetUnk101013d8(p_videoParam.Flags().GetLacksLightSupport() == FALSE); + ViewROI::SetLightSupport(p_videoParam.Flags().GetLacksLightSupport() == FALSE); if (!m_direct3d->Create( hwnd, diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp index 8d8cbb6b..626fe311 100644 --- a/LEGO1/viewmanager/viewroi.cpp +++ b/LEGO1/viewmanager/viewroi.cpp @@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(ViewROI, 0xe4) // GLOBAL: LEGO1 0x101013d8 -undefined g_unk101013d8 = 0; +unsigned char g_lightSupport = FALSE; // FUNCTION: LEGO1 0x100a9eb0 float ViewROI::IntrinsicImportance() const @@ -78,9 +78,9 @@ void ViewROI::VTable0x1c() } // FUNCTION: LEGO1 0x100aa500 -undefined ViewROI::SetUnk101013d8(undefined p_flag) +unsigned char ViewROI::SetLightSupport(unsigned char p_lightSupport) { - undefined oldFlag = g_unk101013d8; - g_unk101013d8 = p_flag; + unsigned char oldFlag = g_lightSupport; + g_lightSupport = p_lightSupport; return oldFlag; } diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h index 444e18f0..a6d2da11 100644 --- a/LEGO1/viewmanager/viewroi.h +++ b/LEGO1/viewmanager/viewroi.h @@ -59,7 +59,7 @@ public: int GetUnknown0xe0() { return m_unk0xe0; } void SetUnknown0xe0(int p_unk0xe0) { m_unk0xe0 = p_unk0xe0; } - static undefined SetUnk101013d8(undefined p_flag); + static unsigned char SetLightSupport(unsigned char p_lightSupport); protected: void UpdateWorldData(const Matrix4& parent2world) override; // vtable+0x28