From e9d8fde8bc0909e7d954de1a8cec5675760860af Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Sun, 14 Jan 2024 17:00:03 -0500 Subject: [PATCH] Fix wrong class name (#438) * push changes * fix * rename file --- CMakeLists.txt | 2 +- LEGO1/lego/legoomni/include/isle.h | 4 ++-- LEGO1/lego/legoomni/include/legoobjectfactory.h | 2 +- .../legoomni/include/{motorcycle.h => motocycle.h} | 12 ++++++------ LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp | 2 +- LEGO1/lego/legoomni/src/isle/isle.cpp | 4 ++-- .../src/isle/{motorcycle.cpp => motocycle.cpp} | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) rename LEGO1/lego/legoomni/include/{motorcycle.h => motocycle.h} (69%) rename LEGO1/lego/legoomni/src/isle/{motorcycle.cpp => motocycle.cpp} (60%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1ee7682..61a8d165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/isle/jukebox.cpp LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp - LEGO1/lego/legoomni/src/isle/motorcycle.cpp + LEGO1/lego/legoomni/src/isle/motocycle.cpp LEGO1/lego/legoomni/src/isle/radio.cpp LEGO1/lego/legoomni/src/isle/radiostate.cpp LEGO1/lego/legoomni/src/isle/skateboard.cpp diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h index d5b7c57b..5ebc5fab 100644 --- a/LEGO1/lego/legoomni/include/isle.h +++ b/LEGO1/lego/legoomni/include/isle.h @@ -12,7 +12,7 @@ class JukeBoxEntity; class Helicopter; class Bike; class DuneBuggy; -class Motorcycle; +class Motocycle; class SkateBoard; class RaceCar; class Jetski; @@ -69,7 +69,7 @@ class Isle : public LegoWorld { Helicopter* m_helicopter; // 0x110 Bike* m_bike; // 0x114 DuneBuggy* m_dunebuggy; // 0x118 - Motorcycle* m_motorcycle; // 0x11c + Motocycle* m_motocycle; // 0x11c SkateBoard* m_skateboard; // 0x120 RaceCar* m_racecar; // 0x124 Jetski* m_jetski; // 0x128 diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h index 3a575c52..552b3cf8 100644 --- a/LEGO1/lego/legoomni/include/legoobjectfactory.h +++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h @@ -70,7 +70,7 @@ X(RaceCar) \ X(Jetski) \ X(Bike) \ - X(Motorcycle) \ + X(Motocycle) \ X(Ambulance) \ X(AmbulanceMissionState) \ X(TowTrack) \ diff --git a/LEGO1/lego/legoomni/include/motorcycle.h b/LEGO1/lego/legoomni/include/motocycle.h similarity index 69% rename from LEGO1/lego/legoomni/include/motorcycle.h rename to LEGO1/lego/legoomni/include/motocycle.h index af04b4ad..0c784027 100644 --- a/LEGO1/lego/legoomni/include/motorcycle.h +++ b/LEGO1/lego/legoomni/include/motocycle.h @@ -1,14 +1,14 @@ -#ifndef MOTORCYCLE_H -#define MOTORCYCLE_H +#ifndef MOTOCYCLE_H +#define MOTOCYCLE_H #include "decomp.h" #include "islepathactor.h" // VTABLE: LEGO1 0x100d7090 // SIZE 0x16c -class Motorcycle : public IslePathActor { +class Motocycle : public IslePathActor { public: - Motorcycle(); + Motocycle(); // FUNCTION: LEGO1 0x10035840 inline virtual const char* ClassName() const override // vtable+0x0c @@ -20,7 +20,7 @@ class Motorcycle : public IslePathActor { // FUNCTION: LEGO1 0x10035850 inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10 { - return !strcmp(p_name, Motorcycle::ClassName()) || IslePathActor::IsA(p_name); + return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name); } private: @@ -29,4 +29,4 @@ class Motorcycle : public IslePathActor { undefined m_unk0x168[4]; }; -#endif // MOTORCYCLE_H +#endif // MOTOCYCLE_H diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp index ff52bad1..bb534169 100644 --- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp +++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp @@ -68,7 +68,7 @@ #include "doors.h" #include "jetski.h" #include "legoanimmmpresenter.h" -#include "motorcycle.h" +#include "motocycle.h" #include "racecar.h" #include "towtrack.h" #include "towtrackmissionstate.h" diff --git a/LEGO1/lego/legoomni/src/isle/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp index 4fba4bb5..e2aca2cf 100644 --- a/LEGO1/lego/legoomni/src/isle/isle.cpp +++ b/LEGO1/lego/legoomni/src/isle/isle.cpp @@ -26,7 +26,7 @@ Isle::Isle() m_helicopter = NULL; m_bike = NULL; m_dunebuggy = NULL; - m_motorcycle = NULL; + m_motocycle = NULL; m_skateboard = NULL; m_racecar = NULL; m_jetski = NULL; @@ -230,7 +230,7 @@ void Isle::VTable0x58(MxCore* p_object) m_dunebuggy = (DuneBuggy*) p_object; } else if (p_object->IsA("Motorcycle")) { - m_motorcycle = (Motorcycle*) p_object; + m_motocycle = (Motocycle*) p_object; } else if (p_object->IsA("SkateBoard")) { m_skateboard = (SkateBoard*) p_object; diff --git a/LEGO1/lego/legoomni/src/isle/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motocycle.cpp similarity index 60% rename from LEGO1/lego/legoomni/src/isle/motorcycle.cpp rename to LEGO1/lego/legoomni/src/isle/motocycle.cpp index 18fabd8a..2628d7ce 100644 --- a/LEGO1/lego/legoomni/src/isle/motorcycle.cpp +++ b/LEGO1/lego/legoomni/src/isle/motocycle.cpp @@ -1,9 +1,9 @@ -#include "motorcycle.h" +#include "motocycle.h" -DECOMP_SIZE_ASSERT(Motorcycle, 0x16c); +DECOMP_SIZE_ASSERT(Motocycle, 0x16c); // FUNCTION: LEGO1 0x100357b0 -Motorcycle::Motorcycle() +Motocycle::Motocycle() { this->m_unk0x13c = 40.0; this->m_unk0x150 = 1.75;