From 69ce14b38c62a04872fa2273268955b36a1c6b8e Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 28 Mar 2025 20:37:41 +0100 Subject: [PATCH] Work around LightTextureMgr regression --- include/egg/gfx/eggLightManager.h | 4 ++-- src/egg/gfx/eggLightTextureMgr.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/egg/gfx/eggLightManager.h b/include/egg/gfx/eggLightManager.h index c863cdc4..00aef3a4 100644 --- a/include/egg/gfx/eggLightManager.h +++ b/include/egg/gfx/eggLightManager.h @@ -85,11 +85,11 @@ public: return num < 8 ? num : 8; } - const LightObject *GetLightObject(u16 i) const { + const LightObject *GetLightObject(int i) const { return &mpLightData[i].mLightObject; } - LightObject *GetLightObject(u16 i) { + LightObject *GetLightObject(int i) { return &mpLightData[i].mLightObject; } diff --git a/src/egg/gfx/eggLightTextureMgr.cpp b/src/egg/gfx/eggLightTextureMgr.cpp index 4acbff26..17f28c6d 100644 --- a/src/egg/gfx/eggLightTextureMgr.cpp +++ b/src/egg/gfx/eggLightTextureMgr.cpp @@ -161,7 +161,7 @@ bool LightTextureManager::setBinaryToTexture(const void *data) { void LightTextureManager::correctLightObject() { int j = 0; for (int i = 0; i < mpLightMgr->GetNumLightData(); i++) { - const LightObject *o = mpLightMgr->GetLightObject(i); + const LightObject *o = mpLightMgr->GetLightObject((u16)i); if (o->CheckFlag1() && o->CheckFlag0x20()) { mpObjects[j] = o; j++;