From 238afc630c954f28062180bf713479bffcf1aec2 Mon Sep 17 00:00:00 2001 From: jonschz Date: Sat, 27 Apr 2024 21:31:41 +0200 Subject: [PATCH] apply clang-format --- LEGO1/lego/legoomni/include/pizza.h | 2 ++ LEGO1/lego/legoomni/src/actors/pizza.cpp | 9 ++++----- LEGO1/lego/legoomni/src/actors/skateboard.cpp | 7 ++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h index 225cf44b..54fa8ccc 100644 --- a/LEGO1/lego/legoomni/include/pizza.h +++ b/LEGO1/lego/legoomni/include/pizza.h @@ -40,8 +40,10 @@ class Pizza : public IsleActor { private: undefined4 m_unk0x7c; // 0x7c undefined4 m_unk0x80; // 0x80 + public: undefined* m_unk0x84; // 0x84 + private: undefined4 m_unk0x88; // 0x88 undefined4 m_unk0x8c; // 0x8c diff --git a/LEGO1/lego/legoomni/src/actors/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp index e480cce6..106ea918 100644 --- a/LEGO1/lego/legoomni/src/actors/pizza.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizza.cpp @@ -30,15 +30,14 @@ MxResult Pizza::Create(MxDSAction& p_dsAction) return SUCCESS; } - // STUB: LEGO1 0x100382b0 -void Pizza::FUN_100382b0() { - +void Pizza::FUN_100382b0() +{ } // STUB: LEGO1 0x10038380 -void Pizza::FUN_10038380() { - +void Pizza::FUN_10038380() +{ } // STUB: LEGO1 0x100383f0 diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp index 3b29538f..2902a951 100644 --- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp +++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp @@ -35,7 +35,7 @@ MxResult SkateBoard::Create(MxDSAction& p_dsAction) this->m_world = CurrentWorld(); this->m_world->Add(this); // The type `Pizza` is an educated guesss, inferred from VTable0xe4() below - Pizza* findResult = (Pizza*)CurrentWorld()->Find(*g_isleScript, 0x49d); + Pizza* findResult = (Pizza*) CurrentWorld()->Find(*g_isleScript, 0x49d); if (findResult) { findResult->m_unk0x84 = (undefined*) this; } @@ -48,10 +48,7 @@ void SkateBoard::VTable0xe4() { // TODO: Work out what kind of structure this points to if (*(int*) (this->m_unk0x164 + 0x18) == 3) { - Pizza* pizza = (Pizza*) CurrentWorld()->Find( - *g_isleScript, - 0x49d - ); + Pizza* pizza = (Pizza*) CurrentWorld()->Find(*g_isleScript, 0x49d); pizza->FUN_10038380(); pizza->FUN_100382b0(); this->m_unk0x160 = 0;