From 82812da1c5a8915e33529203595a9488bfe2e0e0 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 15 Mar 2024 11:19:35 -0400 Subject: [PATCH] Fix naming --- LEGO1/lego/legoomni/include/legonavcontroller.h | 2 +- LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp | 4 ++-- tools/ncc/skip.yml | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h index 025cd207..1621efac 100644 --- a/LEGO1/lego/legoomni/include/legonavcontroller.h +++ b/LEGO1/lego/legoomni/include/legonavcontroller.h @@ -113,7 +113,7 @@ class LegoNavController : public MxCore { // one copy of defaults (these can be set by App.) static int g_defdeadZone; - static float m_defzeroThreshold; + static float g_defzeroThreshold; static float g_defmaxLinearVel; static float g_defmaxRotationalVel; static float g_defmaxLinearAccel; diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp index 90a303a1..e1cf73dd 100644 --- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp @@ -25,7 +25,7 @@ int LegoNavController::g_defdeadZone = 40; // GLOBAL: LEGO1 0x100f4c2c -float LegoNavController::m_defzeroThreshold = 0.001f; +float LegoNavController::g_defzeroThreshold = 0.001f; // GLOBAL: LEGO1 0x100f4c30 float LegoNavController::g_defmaxLinearVel = 40.0f; @@ -102,7 +102,7 @@ void LegoNavController::SetControlMax(int p_hMax, int p_vMax) void LegoNavController::SetToDefaultParams() { m_deadZone = g_defdeadZone; - m_zeroThreshold = m_defzeroThreshold; + m_zeroThreshold = g_defzeroThreshold; m_maxRotationalAccel = g_defmaxRotationalAccel; m_maxLinearAccel = g_defmaxLinearAccel; m_minRotationalAccel = g_defminRotationalAccel; diff --git a/tools/ncc/skip.yml b/tools/ncc/skip.yml index f6d2de8e..fd2a5499 100644 --- a/tools/ncc/skip.yml +++ b/tools/ncc/skip.yml @@ -15,4 +15,8 @@ p_HELDesc: 'Allow this variable name' e_RAMStream: 'Allow this enum constant' p_milliseconds: 'Probably a bug with function call' m_increaseAmount: "Can't currently detect member in union" -m_increaseFactor: "Can't currently detect member in union" \ No newline at end of file +m_increaseFactor: "Can't currently detect member in union" +delta_rad: "Allow original naming from 1996" +delta_pos: "Allow original naming from 1996" +rot_mat: "Allow original naming from 1996" +new_dir: "Allow original naming from 1996"