From c327b0c5fa80db94185a5aaf8230232344cf1400 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 11 Jan 2025 09:12:17 -0700 Subject: [PATCH 1/2] Fix regression in `LegoWorld::Enable` --- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 0781c4b3e2..8c85423bde 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -726,7 +726,11 @@ void LegoWorld::Enable(MxBool p_enable) SetIsWorldActive(TRUE); #endif } +#ifndef BETA10 + else if (!p_enable && m_set0xd0.size() == 0) { +#else else if (!p_enable && m_set0xd0.size() != 0) { +#endif MxPresenter* presenter; LegoPathController* controller; LegoPathActor* actor = UserActor(); From 01a5794e248aa23f6fd7e88ff4d1f061a1f752ad Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 11 Jan 2025 11:33:46 -0700 Subject: [PATCH 2/2] Update legoworld.cpp --- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index 8c85423bde..61e633753e 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -726,11 +726,7 @@ void LegoWorld::Enable(MxBool p_enable) SetIsWorldActive(TRUE); #endif } -#ifndef BETA10 else if (!p_enable && m_set0xd0.size() == 0) { -#else - else if (!p_enable && m_set0xd0.size() != 0) { -#endif MxPresenter* presenter; LegoPathController* controller; LegoPathActor* actor = UserActor();