From ca4f9ca8cfa522579febfa018016f41d8fde9690 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 25 Nov 2024 14:01:48 -0700 Subject: [PATCH] Naming --- LEGO1/lego/legoomni/include/act2brick.h | 14 +++++++------- LEGO1/lego/legoomni/src/entity/act2brick.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h index 1e2a19d9..1ff4529e 100644 --- a/LEGO1/lego/legoomni/include/act2brick.h +++ b/LEGO1/lego/legoomni/include/act2brick.h @@ -31,17 +31,17 @@ class Act2Brick : public LegoPathActor { // SYNTHETIC: LEGO1 0x1007a450 // Act2Brick::`scalar deleting destructor' - void FUN_1007a9d0(); + void StopSound(); private: static MxLong g_lastHitActorTime; - LegoCacheSound* m_unk0x154; // 0x154 - undefined m_unk0x158[0x0c]; // 0x158 - undefined4 m_unk0x164; // 0x164 - Mx3DPointFloat m_unk0x168; // 0x168 - Mx3DPointFloat m_unk0x17c; // 0x17c - MxS32 m_unk0x190; // 0x190 + LegoCacheSound* m_whistleSound; // 0x154 + undefined m_unk0x158[0x0c]; // 0x158 + undefined4 m_unk0x164; // 0x164 + Mx3DPointFloat m_unk0x168; // 0x168 + Mx3DPointFloat m_unk0x17c; // 0x17c + MxS32 m_unk0x190; // 0x190 }; #endif // ACT2BRICK_H diff --git a/LEGO1/lego/legoomni/src/entity/act2brick.cpp b/LEGO1/lego/legoomni/src/entity/act2brick.cpp index 68e2ab4e..a5811f26 100644 --- a/LEGO1/lego/legoomni/src/entity/act2brick.cpp +++ b/LEGO1/lego/legoomni/src/entity/act2brick.cpp @@ -22,7 +22,7 @@ MxLong Act2Brick::g_lastHitActorTime = 0; // FUNCTION: BETA10 0x10012a30 Act2Brick::Act2Brick() { - m_unk0x154 = NULL; + m_whistleSound = NULL; m_unk0x164 = 0; } @@ -78,8 +78,8 @@ MxLong Act2Brick::Notify(MxParam& p_param) if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick && m_roi->GetVisibility()) { m_roi->SetVisibility(FALSE); - if (m_unk0x154 != NULL) { - FUN_1007a9d0(); + if (m_whistleSound != NULL) { + StopSound(); } MxNotificationParam param(c_notificationType22, this); @@ -92,10 +92,10 @@ MxLong Act2Brick::Notify(MxParam& p_param) // FUNCTION: LEGO1 0x1007a9d0 // FUNCTION: BETA10 0x1001300f -void Act2Brick::FUN_1007a9d0() +void Act2Brick::StopSound() { - if (m_unk0x154 != NULL) { - SoundManager()->GetCacheSoundManager()->Stop(m_unk0x154); - m_unk0x154 = NULL; + if (m_whistleSound != NULL) { + SoundManager()->GetCacheSoundManager()->Stop(m_whistleSound); + m_whistleSound = NULL; } }