isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Naming

Browse Source
This commit is contained in:
Christian Semmler 2024-11-25 14:01:48 -07:00
parent 9bfd4ee53a
commit ca4f9ca8cf
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/act2brick.h
View File

@ -31,17 +31,17 @@ class Act2Brick : public LegoPathActor {
// SYNTHETIC: LEGO1 0x1007a450 // SYNTHETIC: LEGO1 0x1007a450
// Act2Brick::`scalar deleting destructor' // Act2Brick::`scalar deleting destructor'
void FUN_1007a9d0(); void StopSound();
private: private:
static MxLong g_lastHitActorTime; static MxLong g_lastHitActorTime;
LegoCacheSound* m_unk0x154; // 0x154 LegoCacheSound* m_whistleSound; // 0x154
undefined m_unk0x158[0x0c]; // 0x158 undefined m_unk0x158[0x0c]; // 0x158
undefined4 m_unk0x164; // 0x164 undefined4 m_unk0x164; // 0x164
Mx3DPointFloat m_unk0x168; // 0x168 Mx3DPointFloat m_unk0x168; // 0x168
Mx3DPointFloat m_unk0x17c; // 0x17c Mx3DPointFloat m_unk0x17c; // 0x17c
MxS32 m_unk0x190; // 0x190 MxS32 m_unk0x190; // 0x190
}; };
#endif // ACT2BRICK_H #endif // ACT2BRICK_H

14
LEGO1/lego/legoomni/src/entity/act2brick.cpp
View File

@ -22,7 +22,7 @@ MxLong Act2Brick::g_lastHitActorTime = 0;
// FUNCTION: BETA10 0x10012a30 // FUNCTION: BETA10 0x10012a30
Act2Brick::Act2Brick() Act2Brick::Act2Brick()
{ {
m_unk0x154 = NULL; m_whistleSound = NULL;
m_unk0x164 = 0; m_unk0x164 = 0;
} }
@ -78,8 +78,8 @@ MxLong Act2Brick::Notify(MxParam& p_param)
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick && m_roi->GetVisibility()) { if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick && m_roi->GetVisibility()) {
m_roi->SetVisibility(FALSE); m_roi->SetVisibility(FALSE);
if (m_unk0x154 != NULL) { if (m_whistleSound != NULL) {
FUN_1007a9d0(); StopSound();
} }
MxNotificationParam param(c_notificationType22, this); MxNotificationParam param(c_notificationType22, this);
@ -92,10 +92,10 @@ MxLong Act2Brick::Notify(MxParam& p_param)
// FUNCTION: LEGO1 0x1007a9d0 // FUNCTION: LEGO1 0x1007a9d0
// FUNCTION: BETA10 0x1001300f // FUNCTION: BETA10 0x1001300f
void Act2Brick::FUN_1007a9d0() void Act2Brick::StopSound()
{ {
if (m_unk0x154 != NULL) { if (m_whistleSound != NULL) {
SoundManager()->GetCacheSoundManager()->Stop(m_unk0x154); SoundManager()->GetCacheSoundManager()->Stop(m_whistleSound);
m_unk0x154 = NULL; m_whistleSound = NULL;
} }
} }