From 689b44d87c023de776952e4954dcbb4f8156575f Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 10 Aug 2025 12:53:27 -0700 Subject: [PATCH] Make atoms in RemoveFromWorld const& (#1676) --- LEGO1/lego/legoomni/include/legoutils.h | 7 ++++++- LEGO1/lego/legoomni/src/common/legoutils.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index 59c34825..dc5d951c 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -60,7 +60,12 @@ MxBool RemoveFromCurrentWorld(const MxAtomId& p_atomId, MxS32 p_id); void EnableAnimations(MxBool p_enable); void SetAppCursor(Cursor p_cursor); MxBool CanExit(); -MxBool RemoveFromWorld(MxAtomId& p_entityAtom, MxS32 p_entityId, MxAtomId& p_worldAtom, MxS32 p_worldEntityId); +MxBool RemoveFromWorld( + const MxAtomId& p_entityAtom, + MxS32 p_entityId, + const MxAtomId& p_worldAtom, + MxS32 p_worldEntityId +); MxS32 UpdateLightPosition(MxS32 p_increase); void SetLightPosition(MxS32 p_index); LegoNamedTexture* ReadNamedTexture(LegoStorage* p_storage); diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index 2f9b1daf..9b62e5b1 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -521,7 +521,12 @@ MxBool RemoveFromCurrentWorld(const MxAtomId& p_atomId, MxS32 p_id) } // FUNCTION: LEGO1 0x1003ee80 -MxBool RemoveFromWorld(MxAtomId& p_entityAtom, MxS32 p_entityId, MxAtomId& p_worldAtom, MxS32 p_worldEntityId) +MxBool RemoveFromWorld( + const MxAtomId& p_entityAtom, + MxS32 p_entityId, + const MxAtomId& p_worldAtom, + MxS32 p_worldEntityId +) { LegoWorld* world = FindWorld(p_worldAtom, p_worldEntityId);