From b03de35e30a04a61a2771433d6440e9937968eaa Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 21 Dec 2024 15:38:22 -0700 Subject: [PATCH] Further accuracy improvement on `LegoNavController::Notify` (#1255) * Further accuracy improvement on `LegoNavController::Notify` * Use enum --- LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp index 717239ae..ddf7960d 100644 --- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp @@ -82,16 +82,16 @@ MxBool LegoNavController::g_defuseRotationalVel = FALSE; MxU32 g_changeLight = FALSE; // GLOBAL: LEGO1 0x100f66a4 -MxU32 g_locationCalcStep = 0; +MxS32 g_locationCalcStep = 0; // GLOBAL: LEGO1 0x100f66a8 -MxU32 g_nextLocation = 0; +MxS32 g_nextLocation = 0; // GLOBAL: LEGO1 0x100f66ac MxBool g_resetPlants = FALSE; // GLOBAL: LEGO1 0x100f66b0 -MxU32 g_animationCalcStep = 0; +MxS32 g_animationCalcStep = 0; // GLOBAL: LEGO1 0x100f66b4 MxS32 g_nextAnimation = 0; @@ -607,8 +607,8 @@ MxResult LegoNavController::ProcessKeyboardInput() bool2 = TRUE; } - MxFloat val = keyFlags & 0x10 ? 1.0f : 4.0f; - MxFloat val2 = keyFlags & 0x10 ? 1.0f : 2.0f; + MxFloat val = keyFlags & LegoInputManager::c_bit5 ? 1.0f : 4.0f; + MxFloat val2 = keyFlags & LegoInputManager::c_bit5 ? 1.0f : 2.0f; if (!bool1) { m_targetRotationalVel = CalculateNewTargetVel(hMax, m_hMax / 2, m_maxRotationalVel);