From 6c0ea3efe7a028702298f2fe1a6605db5aeb66aa Mon Sep 17 00:00:00 2001 From: jonschz Date: Sun, 30 Jun 2024 15:38:42 +0200 Subject: [PATCH] fix linter issues --- LEGO1/lego/legoomni/include/legorace.h | 4 ++-- LEGO1/lego/legoomni/include/legoracecar.h | 4 ++-- LEGO1/lego/legoomni/src/race/legoracecar.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h index 3cb916af..85954a98 100644 --- a/LEGO1/lego/legoomni/include/legorace.h +++ b/LEGO1/lego/legoomni/include/legorace.h @@ -3,8 +3,8 @@ #include "decomp.h" #include "legogamestate.h" -#include "legostate.h" #include "legoracemap.h" +#include "legostate.h" #include "legoworld.h" #include "mxrect32.h" #include "mxtypes.h" @@ -125,7 +125,7 @@ class LegoRace : public LegoWorld { virtual MxLong HandleType0Notification(MxNotificationParam&) { return 0; } // vtable+0x78 // STUB: LEGO1 0x1000dac0 - virtual void VTable0x7c(LegoRaceMap *, undefined4) {} // vtable+0x7c + virtual void VTable0x7c(LegoRaceMap*, undefined4) {} // vtable+0x7c // SYNTHETIC: LEGO1 0x10015cc0 // LegoRace::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h index 673d32d8..673fff8d 100644 --- a/LEGO1/lego/legoomni/include/legoracecar.h +++ b/LEGO1/lego/legoomni/include/legoracecar.h @@ -5,8 +5,8 @@ #include "legoracemap.h" struct EdgeReference { - char* name; - LegoPathBoundary* data; + char* m_name; + LegoPathBoundary* m_data; }; // GLOBAL: LEGO1 0x100f0a20 diff --git a/LEGO1/lego/legoomni/src/race/legoracecar.cpp b/LEGO1/lego/legoomni/src/race/legoracecar.cpp index ec33330b..b9eb49c2 100644 --- a/LEGO1/lego/legoomni/src/race/legoracecar.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracecar.cpp @@ -67,10 +67,10 @@ void LegoRaceCar::ParseAction(char* p_extra) LegoAnimActor::ParseAction(p_extra); LegoRaceMap::ParseAction(p_extra); - LegoRace* current_world = (LegoRace*) CurrentWorld(); + LegoRace* currentWorld = (LegoRace*) CurrentWorld(); - if (KeyValueStringParse(buffer, g_strCOMP, p_extra) && current_world) { - current_world->VTable0x7c(this, atoi(buffer)); + if (KeyValueStringParse(buffer, g_strCOMP, p_extra) && currentWorld) { + currentWorld->VTable0x7c(this, atoi(buffer)); } if (m_userNavFlag) { @@ -86,12 +86,12 @@ void LegoRaceCar::ParseAction(char* p_extra) } // STRING: LEGO1 0x100f0bc4 - m_unk0x78 = current_world->FindPathBoundary("EDG03_44"); + m_unk0x78 = currentWorld->FindPathBoundary("EDG03_44"); // STRING: LEGO1 0x100f0bb8 - m_unk0x7c = current_world->FindPathBoundary("EDG03_54"); + m_unk0x7c = currentWorld->FindPathBoundary("EDG03_54"); for (MxS32 j = 0; j < sizeOfArray(g_edgeReferences); j++) { - g_edgeReferences[j].data = current_world->FindPathBoundary(g_edgeReferences[j].name); + g_edgeReferences[j].m_data = currentWorld->FindPathBoundary(g_edgeReferences[j].m_name); } } }