TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-23 03:55:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow entering helicopter build minigame (#204)

Browse Source 
* LegoCarBuild: cast c_notificationType0 to MxNotificationParam

* MxBackgroundAuioManager gets a MxWavePresenter
This commit is contained in:
Anonymous Maarten 2025-05-30 21:23:54 +02:00 committed by GitHub
parent 364844d6d0
commit 58b5a2b96d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legocarbuild.h
View File

@ -145,7 +145,7 @@ public:
undefined4 FUN_100246e0(MxLong p_x, MxLong p_y); undefined4 FUN_100246e0(MxLong p_x, MxLong p_y);
MxS32 FUN_10024850(MxLong p_x, MxLong p_y); MxS32 FUN_10024850(MxLong p_x, MxLong p_y);
undefined4 FUN_10024890(MxParam* p_param); undefined4 FUN_10024890(MxParam* p_param);
undefined4 FUN_10024c20(LegoEventNotificationParam* p_param); undefined4 FUN_10024c20(MxNotificationParam* p_param);
void FUN_10024ef0(); void FUN_10024ef0();
void FUN_10024f30(); void FUN_10024f30();
void FUN_10024f50(); void FUN_10024f50();

4
LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
View File

@ -3,7 +3,6 @@
#include "legomain.h" #include "legomain.h"
#include "misc.h" #include "misc.h"
#include "mxaudiopresenter.h" #include "mxaudiopresenter.h"
#include "mxcompositepresenter.h"
#include "mxdssound.h" #include "mxdssound.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxnotificationmanager.h" #include "mxnotificationmanager.h"
@ -11,6 +10,7 @@
#include "mxstreamer.h" #include "mxstreamer.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxutilities.h" #include "mxutilities.h"
#include "mxwavepresenter.h"
DECOMP_SIZE_ASSERT(MxBackgroundAudioManager, 0x150) DECOMP_SIZE_ASSERT(MxBackgroundAudioManager, 0x150)
@ -356,7 +356,7 @@ MxResult MxBackgroundAudioManager::SetPendingPresenter(
m_pendingPresenter = (MxAudioPresenter*) p_presenter; m_pendingPresenter = (MxAudioPresenter*) p_presenter;
m_targetVolume = ((MxDSSound*) m_pendingPresenter->GetAction())->GetVolume(); m_targetVolume = ((MxDSSound*) m_pendingPresenter->GetAction())->GetVolume();
((MxCompositePresenter*) m_pendingPresenter)->VTable0x60(NULL); ((MxWavePresenter*) m_pendingPresenter)->SetVolume(0);
m_speed = p_speed; m_speed = p_speed;
m_tickleState = p_tickleState; m_tickleState = p_tickleState;

4
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -659,7 +659,7 @@ MxLong LegoCarBuild::Notify(MxParam& p_param)
if (m_worldStarted) { if (m_worldStarted) {
switch (param.GetNotification()) { switch (param.GetNotification()) {
case c_notificationType0: case c_notificationType0:
FUN_10024c20((LegoEventNotificationParam*) &p_param); FUN_10024c20((MxNotificationParam*) &p_param);
result = 1; result = 1;
break; break;
case c_notificationEndAction: case c_notificationEndAction:
@ -1150,7 +1150,7 @@ undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param)
// FUNCTION: LEGO1 0x10024c20 // FUNCTION: LEGO1 0x10024c20
// FUNCTION: BETA10 0x1006db21 // FUNCTION: BETA10 0x1006db21
undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param) undefined4 LegoCarBuild::FUN_10024c20(MxNotificationParam* p_param)
{ {
LegoEntity* entity; LegoEntity* entity;
assert(m_buildState); assert(m_buildState);