From e9a27e06181da6e45a818c4f6d92911387b4e9ec Mon Sep 17 00:00:00 2001 From: Erik Schulze Date: Mon, 19 May 2025 21:17:19 +0200 Subject: [PATCH] remove dependency on omni types --- LEGO1/viewmanager/viewroi.cpp | 6 +++--- LEGO1/viewmanager/viewroi.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp index 4027dc6e..a84f7b6e 100644 --- a/LEGO1/viewmanager/viewroi.cpp +++ b/LEGO1/viewmanager/viewroi.cpp @@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(ViewROI, 0xe4) // GLOBAL: LEGO1 0x101013d8 -MxBool g_lightSupport = FALSE; +unsigned char g_lightSupport = FALSE; // FUNCTION: LEGO1 0x100a9eb0 float ViewROI::IntrinsicImportance() const @@ -78,9 +78,9 @@ void ViewROI::VTable0x1c() } // FUNCTION: LEGO1 0x100aa500 -MxBool ViewROI::SetLightSupport(MxBool p_flag) +unsigned char ViewROI::SetLightSupport(unsigned char p_flag) { - MxBool oldFlag = g_lightSupport; + unsigned char oldFlag = g_lightSupport; g_lightSupport = p_flag; return oldFlag; } diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h index 75e63ef7..d8df5ab5 100644 --- a/LEGO1/viewmanager/viewroi.h +++ b/LEGO1/viewmanager/viewroi.h @@ -2,7 +2,6 @@ #define VIEWROI_H #include "decomp.h" -#include "omni/include/mxtypes.h" #include "realtime/orientableroi.h" #include "tgl/tgl.h" #include "viewlodlist.h" @@ -60,7 +59,7 @@ class ViewROI : public OrientableROI { int GetUnknown0xe0() { return m_unk0xe0; } void SetUnknown0xe0(int p_unk0xe0) { m_unk0xe0 = p_unk0xe0; } - static MxBool SetLightSupport(MxBool p_flag); + static unsigned char SetLightSupport(unsigned char p_flag); protected: void UpdateWorldData(const Matrix4& parent2world) override; // vtable+0x28