From d0f4725f0f2cd522240aefb6c439262fa1b954d9 Mon Sep 17 00:00:00 2001 From: Fabian Neundorf Date: Fri, 30 May 2025 21:12:49 +0200 Subject: [PATCH 1/2] Fill in unknown color string descriptions (#1531) --- LEGO1/lego/legoomni/src/common/legogamestate.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index 27e35132..e6bffa86 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -99,14 +99,14 @@ ColorStringStruct g_colorSaveData[43] = { {"c_chljety1", "lego black"}, {"c_chrjety1", "lego black"}, // copter left jet, copter right jet {"c_chmidly0", "lego black"}, {"c_chmotry0", "lego blue"}, // copter middle, copter motor {"c_chsidly0", "lego black"}, {"c_chsidry0", "lego black"}, // copter side left, copter side right - {"c_chstuty0", "lego black"}, {"c_chtaily0", "lego black"}, // copter ???, copter tail - {"c_chwindy1", "lego black"}, {"c_dbfbrdy0", "lego red"}, // copter ???, dunebuggy ??? + {"c_chstuty0", "lego black"}, {"c_chtaily0", "lego black"}, // copter skids, copter tail + {"c_chwindy1", "lego black"}, {"c_dbfbrdy0", "lego red"}, // copter windshield, dunebuggy body {"c_dbflagy0", "lego yellow"}, {"c_dbfrfny4", "lego red"}, // dunebuggy flag, dunebuggy front fender {"c_dbfrxly0", "lego white"}, {"c_dbhndly0", "lego white"}, // dunebuggy front axle, dunebuggy handlebar - {"c_dbltbry0", "lego white"}, {"c_jsdashy0", "lego white"}, // dunebuggy ???, jetski dash + {"c_dbltbry0", "lego white"}, {"c_jsdashy0", "lego white"}, // dunebuggy rear lights, jetski dash {"c_jsexhy0", "lego black"}, {"c_jsfrnty5", "lego black"}, // jetski exhaust, jetski front {"c_jshndly0", "lego red"}, {"c_jslsidy0", "lego black"}, // jetski handlebar, jetski left side - {"c_jsrsidy0", "lego black"}, {"c_jsskiby0", "lego red"}, // jetski right side, jetski ??? + {"c_jsrsidy0", "lego black"}, {"c_jsskiby0", "lego red"}, // jetski right side, jetski base {"c_jswnshy5", "lego white"}, {"c_rcbacky6", "lego green"}, // jetski windshield, racecar back {"c_rcedgey0", "lego green"}, {"c_rcfrmey0", "lego red"}, // racecar edge, racecar frame {"c_rcfrnty6", "lego green"}, {"c_rcmotry0", "lego white"}, // racecar front, racecar motor From e813a12a4a92911e6a92a261853607c903695052 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 30 May 2025 21:43:33 +0200 Subject: [PATCH 2/2] Fix notification/presenter casts (#1532) * LegoCarBuild: cast c_notificationType0 to MxNotificationParam * MxBackgroundAuioManager gets a MxWavePresenter --- LEGO1/lego/legoomni/include/legocarbuild.h | 2 +- LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp | 4 ++-- LEGO1/lego/legoomni/src/build/legocarbuild.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h index a28e29b9..bf2a0a76 100644 --- a/LEGO1/lego/legoomni/include/legocarbuild.h +++ b/LEGO1/lego/legoomni/include/legocarbuild.h @@ -143,7 +143,7 @@ public: undefined4 FUN_100246e0(MxLong p_x, MxLong p_y); MxS32 FUN_10024850(MxLong p_x, MxLong p_y); undefined4 FUN_10024890(MxParam* p_param); - undefined4 FUN_10024c20(LegoEventNotificationParam* p_param); + undefined4 FUN_10024c20(MxNotificationParam* p_param); void FUN_10024ef0(); void FUN_10024f30(); void FUN_10024f50(); diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index 040a7e42..8b90d39b 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -3,7 +3,6 @@ #include "legomain.h" #include "misc.h" #include "mxaudiopresenter.h" -#include "mxcompositepresenter.h" #include "mxdssound.h" #include "mxmisc.h" #include "mxnotificationmanager.h" @@ -11,6 +10,7 @@ #include "mxstreamer.h" #include "mxticklemanager.h" #include "mxutilities.h" +#include "mxwavepresenter.h" DECOMP_SIZE_ASSERT(MxBackgroundAudioManager, 0x150) @@ -356,7 +356,7 @@ MxResult MxBackgroundAudioManager::SetPendingPresenter( m_pendingPresenter = (MxAudioPresenter*) p_presenter; m_targetVolume = ((MxDSSound*) m_pendingPresenter->GetAction())->GetVolume(); - ((MxCompositePresenter*) m_pendingPresenter)->VTable0x60(NULL); + ((MxWavePresenter*) m_pendingPresenter)->SetVolume(0); m_speed = p_speed; m_tickleState = p_tickleState; diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index bb91179c..11a7ef0a 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -656,7 +656,7 @@ MxLong LegoCarBuild::Notify(MxParam& p_param) if (m_worldStarted) { switch (param.GetNotification()) { case c_notificationType0: - FUN_10024c20((LegoEventNotificationParam*) &p_param); + FUN_10024c20((MxNotificationParam*) &p_param); result = 1; break; case c_notificationEndAction: @@ -1147,7 +1147,7 @@ undefined4 LegoCarBuild::FUN_10024890(MxParam* p_param) // FUNCTION: LEGO1 0x10024c20 // FUNCTION: BETA10 0x1006db21 -undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param) +undefined4 LegoCarBuild::FUN_10024c20(MxNotificationParam* p_param) { LegoEntity* entity; assert(m_buildState);