From 99402e3dd6329b35f5dd1e10849a47b255b5503b Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 14 Dec 2023 08:04:20 -0500 Subject: [PATCH] Fix names --- LEGO1/helicopter.cpp | 32 ++++++++++++++++---------------- LEGO1/helicopter.h | 2 +- LEGO1/isle.h | 2 +- LEGO1/legoanimationmanager.cpp | 2 +- LEGO1/legoanimationmanager.h | 2 +- LEGO1/legocameracontroller.cpp | 2 +- LEGO1/legocameracontroller.h | 2 +- LEGO1/legopathactor.cpp | 2 +- LEGO1/legopathactor.h | 14 +++++++------- LEGO1/legoutil.cpp | 2 +- LEGO1/legoutil.h | 2 +- LEGO1/legoworld.cpp | 6 +++--- LEGO1/legoworld.h | 6 +++--- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp index 20bc4733..65ad515f 100644 --- a/LEGO1/helicopter.cpp +++ b/LEGO1/helicopter.cpp @@ -98,7 +98,7 @@ MxU32 Helicopter::VTable0xcc() m_script = *g_isleScript; AnimationManager()->FUN_10064670(FALSE); VTable0xe8(0x29, TRUE, 7); - ((Isle*) GetCurrentWorld())->setUnknown13c(0x3c); + ((Isle*) GetCurrentWorld())->SetUnknown13c(0x3c); FUN_10015820(1, 0); TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, TRUE); SetUnknownDC(4); @@ -122,22 +122,22 @@ MxU32 Helicopter::VTable0xcc() MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param) { MxU32 ret = 0; - MxAtomId l_script; + MxAtomId script; switch (GameState()->GetUnknown10()) { case 0: - l_script = *g_isleScript; + script = *g_isleScript; break; case 1: - l_script = *g_act2mainScript; + script = *g_act2mainScript; break; case 2: - l_script = *g_act3Script; + script = *g_act3Script; break; } if (p_param.GetUnknown28() == 1) { switch (p_param.GetUnknown20()) { case 0x17: - if (*g_act3Script == l_script) { + if (*g_act3Script == script) { ((Act3*) GetCurrentWorld())->SetUnkown4270(2); TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE); } @@ -148,37 +148,37 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param) ret = 1; break; case 0x18: { - if (*g_act3Script == l_script) + if (*g_act3Script == script) break; Act1State* state = (Act1State*) GameState()->GetState("Act1State"); if (m_state->GetUnkown8() == 0) { state->SetUnknown18(4); m_state->SetUnknown8(1); m_world->FUN_1001fc80(this); - InvokeAction(ExtraActionType_start, l_script, 0x20, NULL); + InvokeAction(ExtraActionType_start, script, 0x20, NULL); SetUnknownDC(0); } ret = 1; break; } case 0x19: - if (*g_act3Script == l_script) + if (*g_act3Script == script) break; if (m_state->GetUnkown8() == 2) { m_state->SetUnknown8(3); m_world->FUN_1001fc80(this); - InvokeAction(ExtraActionType_start, l_script, 0x21, NULL); + InvokeAction(ExtraActionType_start, script, 0x21, NULL); SetUnknownDC(4); } ret = 1; break; case 0x1a: - if (*g_act3Script != l_script) + if (*g_act3Script != script) break; ret = 1; /* fall through */ case 0x1b: - if (*g_act3Script != l_script) + if (*g_act3Script != script) break; if (m_world && m_world->GetCamera()) { Vector3Data loc, dir, lookat; @@ -202,7 +202,7 @@ MxU32 Helicopter::VTable0xd4(MxType17NotificationParam& p_param) break; case 0x1c: if (GameState()->GetUnknown10() == 0) { - ((Isle*) GetCurrentWorld())->setUnknown13c(2); + ((Isle*) GetCurrentWorld())->SetUnknown13c(2); TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 50, FALSE, FALSE); VTable0xe4(); } @@ -279,16 +279,16 @@ void Helicopter::VTable0x74(Matrix4Impl& p_transform) } // FUNCTION: LEGO1 0x10003ee0 -void Helicopter::VTable0x70(float p) +void Helicopter::VTable0x70(float p_float) { int state = m_state->GetUnkown8(); switch (state) { default: - LegoPathActor::VTable0x70(p); + LegoPathActor::VTable0x70(p_float); return; case 4: case 5: - float f = m_unk0x1f0 - p + 3000; + float f = m_unk0x1f0 - p_float + 3000; if (f >= 0) { float f2 = f / 3000 + 1; if (f2 < 0) diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h index c3398cec..cc4f3b35 100644 --- a/LEGO1/helicopter.h +++ b/LEGO1/helicopter.h @@ -38,7 +38,7 @@ class Helicopter : public IslePathActor { } virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 - void VTable0x70(float p) override; // vtable+0x70 + void VTable0x70(float p_float) override; // vtable+0x70 void VTable0x74(Matrix4Impl& p_transform) override; // vtable+0x74 virtual MxU32 VTable0xcc() override; // vtable+0xcc virtual MxU32 VTable0xd4(MxType17NotificationParam& p_param) override; // vtable+0xd4 diff --git a/LEGO1/isle.h b/LEGO1/isle.h index cc95d4a3..16989416 100644 --- a/LEGO1/isle.h +++ b/LEGO1/isle.h @@ -22,7 +22,7 @@ class Isle : public LegoWorld { { return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name); } - inline void setUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; } + inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; } protected: undefined m_unk0xf8[0x44]; // 0xf8 diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/legoanimationmanager.cpp index 3a65933a..444eeccf 100644 --- a/LEGO1/legoanimationmanager.cpp +++ b/LEGO1/legoanimationmanager.cpp @@ -50,6 +50,6 @@ MxResult LegoAnimationManager::Tickle() } // STUB: LEGO1 0x10064670 -void LegoAnimationManager::FUN_10064670(MxBool p) +void LegoAnimationManager::FUN_10064670(MxBool) { } diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/legoanimationmanager.h index eacb35bf..c13436c9 100644 --- a/LEGO1/legoanimationmanager.h +++ b/LEGO1/legoanimationmanager.h @@ -27,7 +27,7 @@ class LegoAnimationManager : public MxCore { } void FUN_1005f6d0(MxBool); - void FUN_10064670(MxBool p); + void FUN_10064670(MxBool); __declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig); diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/legocameracontroller.cpp index 8a74e7df..a182d025 100644 --- a/LEGO1/legocameracontroller.cpp +++ b/LEGO1/legocameracontroller.cpp @@ -18,7 +18,7 @@ void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3 } // STUB: LEGO1 0x100123e0 -void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32 p_2) +void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32) { } diff --git a/LEGO1/legocameracontroller.h b/LEGO1/legocameracontroller.h index 855f90b1..73d337c3 100644 --- a/LEGO1/legocameracontroller.h +++ b/LEGO1/legocameracontroller.h @@ -26,7 +26,7 @@ class LegoCameraController : public MxCore { } void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up); - void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32 p_2); + void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32); Vector3Data& FUN_10012740(); Vector3Data& FUN_100127f0(); Vector3Data& FUN_100128a0(); diff --git a/LEGO1/legopathactor.cpp b/LEGO1/legopathactor.cpp index 9f2b48c0..f6d0a10d 100644 --- a/LEGO1/legopathactor.cpp +++ b/LEGO1/legopathactor.cpp @@ -45,7 +45,7 @@ void LegoPathActor::VTable0x74(Matrix4Impl& p_transform) } // STUB: LEGO1 0x1002e790 -void LegoPathActor::VTable0x70(float p) +void LegoPathActor::VTable0x70(float) { // TODO } diff --git a/LEGO1/legopathactor.h b/LEGO1/legopathactor.h index f64e73f4..f331e8ce 100644 --- a/LEGO1/legopathactor.h +++ b/LEGO1/legopathactor.h @@ -27,10 +27,10 @@ class LegoPathActor : public LegoActor { virtual void VTable0x68(); // vtable+0x68 virtual void VTable0x6c(); // vtable+0x6c - virtual void VTable0x70(float p); // vtable+0x70 + virtual void VTable0x70(float p_float); // vtable+0x70 virtual void VTable0x74(Matrix4Impl& p_transform); // vtable+0x74 // FUNCTION: LEGO1 0x10002d20 - virtual void VTable0x78(MxU8 p_1) { m_unk0xea = p_1; } // vtable+0x78 + virtual void VTable0x78(MxU8 p_unk0xea) { m_unk0xea = p_unk0xea; } // vtable+0x78 // FUNCTION: LEGO1 0x10002d30 virtual MxU8 VTable0x7c() { return m_unk0xea; } // vtable+0x7c virtual void VTable0x80(); // vtable+0x80 @@ -48,7 +48,7 @@ class LegoPathActor : public LegoActor { virtual void VTable0xa4(); // vtable+0xa4 virtual void VTable0xa8(); // vtable+0xa8 // FUNCTION: LEGO1 0x10002d70 - virtual void VTable0xac(MxFloat p_1) { m_unk0x140 = p_1; } // vtable+0xac + virtual void VTable0xac(MxFloat p_unk0x13c) { m_unk0x13c = p_unk0x13c; } // vtable+0xac // FUNCTION: LEGO1 0x10002d80 virtual MxFloat VTable0xb0() { return m_unk0x13c; } // vtable+0xb0 // FUNCTION: LEGO1 0x10002d90 @@ -56,15 +56,15 @@ class LegoPathActor : public LegoActor { // FUNCTION: LEGO1 0x10002da0 virtual MxFloat VTable0xb8() { return m_unk0x144; } // vtable+0xb8 // FUNCTION: LEGO1 0x10002db0 - virtual void VTable0xbc(MxFloat p_1) { m_unk0x140 = p_1; } // vtable+0xbc + virtual void VTable0xbc(MxFloat p_unk0x140) { m_unk0x140 = p_unk0x140; } // vtable+0xbc // FUNCTION: LEGO1 0x10002dc0 - virtual void VTable0xc0(MxFloat p_1) { m_unk0x144 = p_1; } // vtable+0xc0 + virtual void VTable0xc0(MxFloat p_unk0x144) { m_unk0x144 = p_unk0x144; } // vtable+0xc0 // FUNCTION: LEGO1 0x10002dd0 virtual void VTable0xc4() {} // vtable+0xc4 // FUNCTION: LEGO1 0x10002de0 - virtual void VTable0xc8(MxU8 p_1) { m_unk0x148 = p_1; } // vtable+0xc8 + virtual void VTable0xc8(MxU8 p_unk0x148) { m_unk0x148 = p_unk0x148; } // vtable+0xc8 - inline void SetUnknownDC(MxU32 p) { m_unk0xdc = p; } + inline void SetUnknownDC(MxU32 p_unk0xdc) { m_unk0xdc = p_unk0xdc; } protected: undefined m_unk0x78[0x64]; // 0x78 diff --git a/LEGO1/legoutil.cpp b/LEGO1/legoutil.cpp index 5603b57a..9aca429d 100644 --- a/LEGO1/legoutil.cpp +++ b/LEGO1/legoutil.cpp @@ -35,7 +35,7 @@ ExtraActionType MatchActionString(const char* p_str) } // STUB: LEGO1 0x1003e430 -void InvokeAction(ExtraActionType actionId, MxAtomId& pAtom, int targetEntityId, LegoEntity* sender) +void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender) { } diff --git a/LEGO1/legoutil.h b/LEGO1/legoutil.h index d8d24886..f2413450 100644 --- a/LEGO1/legoutil.h +++ b/LEGO1/legoutil.h @@ -56,7 +56,7 @@ inline void GetString(char** p_source, const char* p_dest, T* p_obj, void (T::*p } ExtraActionType MatchActionString(const char*); -void InvokeAction(ExtraActionType actionId, MxAtomId& pAtom, int targetEntityId, LegoEntity* sender); +void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender); void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bOut, float* p_gOut); void FUN_1003ee00(MxAtomId& p_atomId, MxS32 p_id); void SetAppCursor(WPARAM p_wparam); diff --git a/LEGO1/legoworld.cpp b/LEGO1/legoworld.cpp index d3060610..f665c3b0 100644 --- a/LEGO1/legoworld.cpp +++ b/LEGO1/legoworld.cpp @@ -87,7 +87,7 @@ void LegoWorld::VTable0x54() } // FUNCTION: LEGO1 0x1001fc80 -void LegoWorld::FUN_1001fc80(IslePathActor* actor) +void LegoWorld::FUN_1001fc80(IslePathActor* p_actor) { } @@ -121,13 +121,13 @@ void LegoWorld::Stop() } // STUB: LEGO1 0x100727e0 -MxBool LegoWorld::FUN_100727e0(MxU32 p, Vector3Data& loc, Vector3Data& dir, Vector3Data& up) +MxBool LegoWorld::FUN_100727e0(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up) { return FALSE; } // STUB: LEGO1 0x10072980 -MxBool LegoWorld::FUN_10072980(MxU32 p, Vector3Data& loc, Vector3Data& dir, Vector3Data& up) +MxBool LegoWorld::FUN_10072980(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up) { return FALSE; } diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h index a232a186..98e6798e 100644 --- a/LEGO1/legoworld.h +++ b/LEGO1/legoworld.h @@ -45,9 +45,9 @@ class LegoWorld : public LegoEntity { MxResult SetAsCurrentWorld(MxDSObject& p_dsObject); void EndAction(MxPresenter* p_presenter); - void FUN_1001fc80(IslePathActor* actor); - MxBool FUN_100727e0(MxU32 p, Vector3Data& loc, Vector3Data& dir, Vector3Data& up); - MxBool FUN_10072980(MxU32 p, Vector3Data& loc, Vector3Data& dir, Vector3Data& up); + void FUN_1001fc80(IslePathActor* p_actor); + MxBool FUN_100727e0(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up); + MxBool FUN_10072980(MxU32, Vector3Data& p_loc, Vector3Data& p_dir, Vector3Data& p_up); void FUN_10073400(); void FUN_10073430();