isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-29 11:06:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong class name (#438)

Browse source 
* push changes

* fix

* rename file
This commit is contained in:
Misha 2024-01-14 17:00:03 -05:00 committed by GitHub
parent 763fcf8980
commit e9d8fde8bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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

4
LEGO1/lego/legoomni/include/isle.h
View file

@ -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

2
LEGO1/lego/legoomni/include/legoobjectfactory.h
View file

@ -70,7 +70,7 @@
X(RaceCar) \
X(Jetski) \
X(Bike) \
X(Motorcycle) \
X(Motocycle) \
X(Ambulance) \
X(AmbulanceMissionState) \
X(TowTrack) \

12
LEGO1/lego/legoomni/include/motorcycle.h → LEGO1/lego/legoomni/include/motocycle.h
View file

@ -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

2
LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp
View file

@ -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"

4
LEGO1/lego/legoomni/src/isle/isle.cpp
View file

@ -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;

6
LEGO1/lego/legoomni/src/isle/motorcycle.cpp → LEGO1/lego/legoomni/src/isle/motocycle.cpp
View file

@ -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;