mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 09:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Name

Browse Source
This commit is contained in:
Christian Semmler
2024-06-06 11:18:49 -04:00
parent b68532d1b1
commit ba166f4e32
16 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legonavcontroller.h
View File

@@ -80,7 +80,7 @@ public:
inline MxFloat GetLinearVel() { return m_linearVel; } inline MxFloat GetLinearVel() { return m_linearVel; }
inline MxFloat GetRotationalVel() { return m_rotationalVel; } inline MxFloat GetRotationalVel() { return m_rotationalVel; }
inline MxFloat GetMaxLinearVel() { return m_maxLinearVel; } inline MxFloat GetMaxLinearVel() { return m_maxLinearVel; }
inline void ResetLinearVel(MxFloat p_maxLinearVel) inline void ResetMaxLinearVel(MxFloat p_maxLinearVel)
{ {
m_maxLinearVel = p_maxLinearVel; m_maxLinearVel = p_maxLinearVel;
m_trackDefault = 0; m_trackDefault = 0;

6
LEGO1/lego/legoomni/include/legopathactor.h
View File

@@ -100,10 +100,10 @@ public:
virtual void VTable0xa8(); // vtable+0xa8 virtual void VTable0xa8(); // vtable+0xa8
// FUNCTION: LEGO1 0x10002d70 // FUNCTION: LEGO1 0x10002d70
virtual void VTable0xac(MxFloat p_unk0x13c) { m_unk0x13c = p_unk0x13c; } // vtable+0xac virtual void VTable0xac(MxFloat p_unk0x13c) { m_maxLinearVel = p_unk0x13c; } // vtable+0xac
// FUNCTION: LEGO1 0x10002d80 // FUNCTION: LEGO1 0x10002d80
virtual MxFloat VTable0xb0() { return m_unk0x13c; } // vtable+0xb0 virtual MxFloat VTable0xb0() { return m_maxLinearVel; } // vtable+0xb0
// FUNCTION: LEGO1 0x10002d90 // FUNCTION: LEGO1 0x10002d90
virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4 virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4
@@ -162,7 +162,7 @@ protected:
MxMatrix m_unk0xec; // 0xec MxMatrix m_unk0xec; // 0xec
LegoPathEdgeContainer* m_grec; // 0x134 LegoPathEdgeContainer* m_grec; // 0x134
LegoPathController* m_controller; // 0x138 LegoPathController* m_controller; // 0x138
MxFloat m_unk0x13c; // 0x13c MxFloat m_maxLinearVel; // 0x13c
MxFloat m_unk0x140; // 0x140 MxFloat m_unk0x140; // 0x140
MxFloat m_unk0x144; // 0x144 MxFloat m_unk0x144; // 0x144
MxU8 m_unk0x148; // 0x148 MxU8 m_unk0x148; // 0x148

2
LEGO1/lego/legoomni/src/actors/ambulance.cpp
View File

@@ -27,7 +27,7 @@ Ambulance::Ambulance()
m_unk0x178 = -1; m_unk0x178 = -1;
m_unk0x170 = 0; m_unk0x170 = 0;
m_unk0x172 = 0; m_unk0x172 = 0;
m_unk0x13c = 40.0; m_maxLinearVel = 40.0;
m_unk0x17c = 1.0; m_unk0x17c = 1.0;
} }

2
LEGO1/lego/legoomni/src/actors/bike.cpp
View File

@@ -13,7 +13,7 @@ DECOMP_SIZE_ASSERT(Bike, 0x164)
// FUNCTION: LEGO1 0x10076670 // FUNCTION: LEGO1 0x10076670
Bike::Bike() Bike::Bike()
{ {
this->m_unk0x13c = 20.0; this->m_maxLinearVel = 20.0;
this->m_unk0x150 = 3.0; this->m_unk0x150 = 3.0;
this->m_unk0x148 = 1; this->m_unk0x148 = 1;
} }

2
LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
View File

@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c)
// FUNCTION: LEGO1 0x10067bb0 // FUNCTION: LEGO1 0x10067bb0
DuneBuggy::DuneBuggy() DuneBuggy::DuneBuggy()
{ {
this->m_unk0x13c = 25.0; this->m_maxLinearVel = 25.0;
this->m_unk0x164 = 1.0; this->m_unk0x164 = 1.0;
} }

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@@ -25,7 +25,7 @@ DECOMP_SIZE_ASSERT(MxMatrix, 0x48)
// FUNCTION: LEGO1 0x10001e60 // FUNCTION: LEGO1 0x10001e60
Helicopter::Helicopter() Helicopter::Helicopter()
{ {
m_unk0x13c = 60; m_maxLinearVel = 60;
} }
// FUNCTION: LEGO1 0x10003230 // FUNCTION: LEGO1 0x10003230

6
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@@ -26,7 +26,7 @@ IslePathActor::SpawnLocation g_spawnLocations[IslePathActor::c_LOCATIONS_NUM];
IslePathActor::IslePathActor() IslePathActor::IslePathActor()
{ {
m_world = NULL; m_world = NULL;
m_unk0x13c = 6.0; m_maxLinearVel = 6.0;
m_previousVel = 1.0; m_previousVel = 1.0;
m_previousActor = NULL; m_previousActor = NULL;
} }
@@ -89,7 +89,7 @@ void IslePathActor::Enter()
ResetWorldTransform(TRUE); ResetWorldTransform(TRUE);
SetUserNavFlag(TRUE); SetUserNavFlag(TRUE);
NavController()->ResetLinearVel(m_unk0x13c); NavController()->ResetMaxLinearVel(m_maxLinearVel);
SetCurrentActor(this); SetCurrentActor(this);
FUN_1001b660(); FUN_1001b660();
@@ -111,7 +111,7 @@ void IslePathActor::Exit()
if (m_previousActor != NULL) { if (m_previousActor != NULL) {
SetCurrentActor(m_previousActor); SetCurrentActor(m_previousActor);
NavController()->ResetLinearVel(m_previousVel); NavController()->ResetMaxLinearVel(m_previousVel);
m_previousActor->ResetWorldTransform(TRUE); m_previousActor->ResetWorldTransform(TRUE);
m_previousActor->SetUserNavFlag(TRUE); m_previousActor->SetUserNavFlag(TRUE);
m_previousActor->SetBoundary(m_boundary); m_previousActor->SetBoundary(m_boundary);

2
LEGO1/lego/legoomni/src/actors/jetski.cpp
View File

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Jetski, 0x164)
// FUNCTION: LEGO1 0x1007e3b0 // FUNCTION: LEGO1 0x1007e3b0
Jetski::Jetski() Jetski::Jetski()
{ {
this->m_unk0x13c = 25.0; this->m_maxLinearVel = 25.0;
this->m_unk0x150 = 2.0; this->m_unk0x150 = 2.0;
this->m_unk0x148 = 1; this->m_unk0x148 = 1;
} }

2
LEGO1/lego/legoomni/src/actors/motorcycle.cpp
View File

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Motocycle, 0x16c)
// FUNCTION: LEGO1 0x100357b0 // FUNCTION: LEGO1 0x100357b0
Motocycle::Motocycle() Motocycle::Motocycle()
{ {
this->m_unk0x13c = 40.0; this->m_maxLinearVel = 40.0;
this->m_unk0x150 = 1.75; this->m_unk0x150 = 1.75;
this->m_unk0x148 = 1; this->m_unk0x148 = 1;
this->m_unk0x164 = 1.0; this->m_unk0x164 = 1.0;

2
LEGO1/lego/legoomni/src/actors/racecar.cpp
View File

@@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(RaceCar, 0x164)
// FUNCTION: LEGO1 0x10028200 // FUNCTION: LEGO1 0x10028200
RaceCar::RaceCar() RaceCar::RaceCar()
{ {
m_unk0x13c = 40.0; m_maxLinearVel = 40.0;
} }
// FUNCTION: LEGO1 0x10028420 // FUNCTION: LEGO1 0x10028420

2
LEGO1/lego/legoomni/src/actors/skateboard.cpp
View File

@@ -21,7 +21,7 @@ DECOMP_SIZE_ASSERT(SkateBoard, 0x168)
SkateBoard::SkateBoard() SkateBoard::SkateBoard()
{ {
m_unk0x160 = FALSE; m_unk0x160 = FALSE;
m_unk0x13c = 15.0; m_maxLinearVel = 15.0;
m_unk0x150 = 3.5; m_unk0x150 = 3.5;
m_unk0x148 = 1; m_unk0x148 = 1;

2
LEGO1/lego/legoomni/src/actors/towtrack.cpp
View File

@@ -21,7 +21,7 @@ TowTrack::TowTrack()
m_unk0x170 = -1; m_unk0x170 = -1;
m_unk0x16e = 0; m_unk0x16e = 0;
m_unk0x174 = -1; m_unk0x174 = -1;
m_unk0x13c = 40.0; m_maxLinearVel = 40.0;
m_unk0x178 = 1.0; m_unk0x178 = 1.0;
} }

2
LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp
View File

@@ -29,7 +29,7 @@ LegoCarRaceActor::LegoCarRaceActor()
m_unk0x08 = 1.0f; m_unk0x08 = 1.0f;
m_unk0x70 = 0.0f; m_unk0x70 = 0.0f;
m_unk0x0c = 0; m_unk0x0c = 0;
m_unk0x13c = 0.0f; m_maxLinearVel = 0.0f;
m_frequencyFactor = 1.0f; m_frequencyFactor = 1.0f;
m_unk0x1c = 0; m_unk0x1c = 0;
m_unk0x10 = 0.65f; m_unk0x10 = 0.65f;

4
LEGO1/lego/legoomni/src/entity/legojetski.cpp
View File

@@ -10,11 +10,11 @@ void LegoJetski::FUN_100136f0(float p_worldSpeed)
{ {
if (p_worldSpeed < 0) { if (p_worldSpeed < 0) {
LegoCarRaceActor::m_unk0x0c = 2; LegoCarRaceActor::m_unk0x0c = 2;
m_unk0x13c = 0; m_maxLinearVel = 0;
SetWorldSpeed(0); SetWorldSpeed(0);
} }
else { else {
m_unk0x13c = p_worldSpeed; m_maxLinearVel = p_worldSpeed;
} }
} }

2
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@@ -553,7 +553,7 @@ void LegoPathActor::ParseAction(char* p_extra)
if (KeyValueStringParse(value, g_strPERMIT_NAVIGATE, p_extra)) { if (KeyValueStringParse(value, g_strPERMIT_NAVIGATE, p_extra)) {
SetUserNavFlag(TRUE); SetUserNavFlag(TRUE);
NavController()->ResetLinearVel(m_worldSpeed); NavController()->ResetMaxLinearVel(m_worldSpeed);
SetCurrentActor(this); SetCurrentActor(this);
} }

4
LEGO1/lego/legoomni/src/race/legoracecar.cpp
View File

@@ -23,11 +23,11 @@ void LegoRaceCar::FUN_10012ea0(float p_worldSpeed)
{ {
if (p_worldSpeed < 0) { if (p_worldSpeed < 0) {
LegoCarRaceActor::m_unk0x0c = 2; LegoCarRaceActor::m_unk0x0c = 2;
m_unk0x13c = 0; m_maxLinearVel = 0;
SetWorldSpeed(0); SetWorldSpeed(0);
} }
else { else {
m_unk0x13c = p_worldSpeed; m_maxLinearVel = p_worldSpeed;
} }
} }