diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h index 8e54bd1e..3e310dde 100644 --- a/LEGO1/lego/legoomni/include/legonavcontroller.h +++ b/LEGO1/lego/legoomni/include/legonavcontroller.h @@ -80,7 +80,7 @@ public: inline MxFloat GetLinearVel() { return m_linearVel; } inline MxFloat GetRotationalVel() { return m_rotationalVel; } inline MxFloat GetMaxLinearVel() { return m_maxLinearVel; } - inline void ResetLinearVel(MxFloat p_maxLinearVel) + inline void ResetMaxLinearVel(MxFloat p_maxLinearVel) { m_maxLinearVel = p_maxLinearVel; m_trackDefault = 0; diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h index 71e9f68e..f5be02b9 100644 --- a/LEGO1/lego/legoomni/include/legopathactor.h +++ b/LEGO1/lego/legoomni/include/legopathactor.h @@ -100,10 +100,10 @@ public: virtual void VTable0xa8(); // vtable+0xa8 // 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 - virtual MxFloat VTable0xb0() { return m_unk0x13c; } // vtable+0xb0 + virtual MxFloat VTable0xb0() { return m_maxLinearVel; } // vtable+0xb0 // FUNCTION: LEGO1 0x10002d90 virtual MxFloat VTable0xb4() { return m_unk0x140; } // vtable+0xb4 @@ -162,7 +162,7 @@ protected: MxMatrix m_unk0xec; // 0xec LegoPathEdgeContainer* m_grec; // 0x134 LegoPathController* m_controller; // 0x138 - MxFloat m_unk0x13c; // 0x13c + MxFloat m_maxLinearVel; // 0x13c MxFloat m_unk0x140; // 0x140 MxFloat m_unk0x144; // 0x144 MxU8 m_unk0x148; // 0x148 diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 3a16bea0..e1a52601 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -27,7 +27,7 @@ Ambulance::Ambulance() m_unk0x178 = -1; m_unk0x170 = 0; m_unk0x172 = 0; - m_unk0x13c = 40.0; + m_maxLinearVel = 40.0; m_unk0x17c = 1.0; } diff --git a/LEGO1/lego/legoomni/src/actors/bike.cpp b/LEGO1/lego/legoomni/src/actors/bike.cpp index f92125a2..3511971f 100644 --- a/LEGO1/lego/legoomni/src/actors/bike.cpp +++ b/LEGO1/lego/legoomni/src/actors/bike.cpp @@ -13,7 +13,7 @@ DECOMP_SIZE_ASSERT(Bike, 0x164) // FUNCTION: LEGO1 0x10076670 Bike::Bike() { - this->m_unk0x13c = 20.0; + this->m_maxLinearVel = 20.0; this->m_unk0x150 = 3.0; this->m_unk0x148 = 1; } diff --git a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp index b6da3892..f8d9f2dd 100644 --- a/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp +++ b/LEGO1/lego/legoomni/src/actors/dunebuggy.cpp @@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c) // FUNCTION: LEGO1 0x10067bb0 DuneBuggy::DuneBuggy() { - this->m_unk0x13c = 25.0; + this->m_maxLinearVel = 25.0; this->m_unk0x164 = 1.0; } diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index fe77c926..2a32ca1a 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -25,7 +25,7 @@ DECOMP_SIZE_ASSERT(MxMatrix, 0x48) // FUNCTION: LEGO1 0x10001e60 Helicopter::Helicopter() { - m_unk0x13c = 60; + m_maxLinearVel = 60; } // FUNCTION: LEGO1 0x10003230 diff --git a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp index 4d630d97..a1e7ffac 100644 --- a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp +++ b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp @@ -26,7 +26,7 @@ IslePathActor::SpawnLocation g_spawnLocations[IslePathActor::c_LOCATIONS_NUM]; IslePathActor::IslePathActor() { m_world = NULL; - m_unk0x13c = 6.0; + m_maxLinearVel = 6.0; m_previousVel = 1.0; m_previousActor = NULL; } @@ -89,7 +89,7 @@ void IslePathActor::Enter() ResetWorldTransform(TRUE); SetUserNavFlag(TRUE); - NavController()->ResetLinearVel(m_unk0x13c); + NavController()->ResetMaxLinearVel(m_maxLinearVel); SetCurrentActor(this); FUN_1001b660(); @@ -111,7 +111,7 @@ void IslePathActor::Exit() if (m_previousActor != NULL) { SetCurrentActor(m_previousActor); - NavController()->ResetLinearVel(m_previousVel); + NavController()->ResetMaxLinearVel(m_previousVel); m_previousActor->ResetWorldTransform(TRUE); m_previousActor->SetUserNavFlag(TRUE); m_previousActor->SetBoundary(m_boundary); diff --git a/LEGO1/lego/legoomni/src/actors/jetski.cpp b/LEGO1/lego/legoomni/src/actors/jetski.cpp index a3806801..8b79a9d3 100644 --- a/LEGO1/lego/legoomni/src/actors/jetski.cpp +++ b/LEGO1/lego/legoomni/src/actors/jetski.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Jetski, 0x164) // FUNCTION: LEGO1 0x1007e3b0 Jetski::Jetski() { - this->m_unk0x13c = 25.0; + this->m_maxLinearVel = 25.0; this->m_unk0x150 = 2.0; this->m_unk0x148 = 1; } diff --git a/LEGO1/lego/legoomni/src/actors/motorcycle.cpp b/LEGO1/lego/legoomni/src/actors/motorcycle.cpp index 6537964f..101656d0 100644 --- a/LEGO1/lego/legoomni/src/actors/motorcycle.cpp +++ b/LEGO1/lego/legoomni/src/actors/motorcycle.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Motocycle, 0x16c) // FUNCTION: LEGO1 0x100357b0 Motocycle::Motocycle() { - this->m_unk0x13c = 40.0; + this->m_maxLinearVel = 40.0; this->m_unk0x150 = 1.75; this->m_unk0x148 = 1; this->m_unk0x164 = 1.0; diff --git a/LEGO1/lego/legoomni/src/actors/racecar.cpp b/LEGO1/lego/legoomni/src/actors/racecar.cpp index 217360b5..c4f57c9d 100644 --- a/LEGO1/lego/legoomni/src/actors/racecar.cpp +++ b/LEGO1/lego/legoomni/src/actors/racecar.cpp @@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(RaceCar, 0x164) // FUNCTION: LEGO1 0x10028200 RaceCar::RaceCar() { - m_unk0x13c = 40.0; + m_maxLinearVel = 40.0; } // FUNCTION: LEGO1 0x10028420 diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp index e91ba114..90480a84 100644 --- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp +++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp @@ -21,7 +21,7 @@ DECOMP_SIZE_ASSERT(SkateBoard, 0x168) SkateBoard::SkateBoard() { m_unk0x160 = FALSE; - m_unk0x13c = 15.0; + m_maxLinearVel = 15.0; m_unk0x150 = 3.5; m_unk0x148 = 1; diff --git a/LEGO1/lego/legoomni/src/actors/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp index c1c5a2bf..40958be7 100644 --- a/LEGO1/lego/legoomni/src/actors/towtrack.cpp +++ b/LEGO1/lego/legoomni/src/actors/towtrack.cpp @@ -21,7 +21,7 @@ TowTrack::TowTrack() m_unk0x170 = -1; m_unk0x16e = 0; m_unk0x174 = -1; - m_unk0x13c = 40.0; + m_maxLinearVel = 40.0; m_unk0x178 = 1.0; } diff --git a/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp index af8c95b0..7414b8bf 100644 --- a/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legocarraceactor.cpp @@ -29,7 +29,7 @@ LegoCarRaceActor::LegoCarRaceActor() m_unk0x08 = 1.0f; m_unk0x70 = 0.0f; m_unk0x0c = 0; - m_unk0x13c = 0.0f; + m_maxLinearVel = 0.0f; m_frequencyFactor = 1.0f; m_unk0x1c = 0; m_unk0x10 = 0.65f; diff --git a/LEGO1/lego/legoomni/src/entity/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp index a0e72803..5160ab25 100644 --- a/LEGO1/lego/legoomni/src/entity/legojetski.cpp +++ b/LEGO1/lego/legoomni/src/entity/legojetski.cpp @@ -10,11 +10,11 @@ void LegoJetski::FUN_100136f0(float p_worldSpeed) { if (p_worldSpeed < 0) { LegoCarRaceActor::m_unk0x0c = 2; - m_unk0x13c = 0; + m_maxLinearVel = 0; SetWorldSpeed(0); } else { - m_unk0x13c = p_worldSpeed; + m_maxLinearVel = p_worldSpeed; } } diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp index 6990f1dd..9f026760 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp @@ -553,7 +553,7 @@ void LegoPathActor::ParseAction(char* p_extra) if (KeyValueStringParse(value, g_strPERMIT_NAVIGATE, p_extra)) { SetUserNavFlag(TRUE); - NavController()->ResetLinearVel(m_worldSpeed); + NavController()->ResetMaxLinearVel(m_worldSpeed); SetCurrentActor(this); } diff --git a/LEGO1/lego/legoomni/src/race/legoracecar.cpp b/LEGO1/lego/legoomni/src/race/legoracecar.cpp index 949ae142..0345f9eb 100644 --- a/LEGO1/lego/legoomni/src/race/legoracecar.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracecar.cpp @@ -23,11 +23,11 @@ void LegoRaceCar::FUN_10012ea0(float p_worldSpeed) { if (p_worldSpeed < 0) { LegoCarRaceActor::m_unk0x0c = 2; - m_unk0x13c = 0; + m_maxLinearVel = 0; SetWorldSpeed(0); } else { - m_unk0x13c = p_worldSpeed; + m_maxLinearVel = p_worldSpeed; } }