From a35f7e74cc0d6aa789e145884aebd3ec997377a8 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 10 Jan 2024 15:34:04 +0100 Subject: [PATCH] msys2 mingw compat (cannot pass reference of rvalue) --- .../legoomni/src/common/legoactioncontrolpresenter.cpp | 7 +++++++ LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp index 953aef36..3649bb50 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -39,7 +39,14 @@ void LegoActionControlPresenter::RepeatingTickle() ParseExtra(); } +#ifdef COMPAT_MODE + { + MxAtomId atom(m_unk0x54.GetData(), LookupMode_LowerCase2); + InvokeAction(m_unk0x50, atom, m_unk0x64, NULL); + } +#else InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL); +#endif m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Done; } diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp index 34afaac0..a7a0979b 100644 --- a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -10,7 +10,14 @@ DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8); // FUNCTION: LEGO1 0x10011d50 LegoCameraController::LegoCameraController() { +#ifdef COMPAT_MODE + Vector3Data at(0, 0, 0); + Vector3Data dir(0, 0, 1); + Vector3Data up(0, 1, 0); + SetWorldTransform(at, dir, up); +#else SetWorldTransform(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0)); +#endif } // FUNCTION: LEGO1 0x10011f70