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

Address review comments, part 2

Browse Source
This commit is contained in:
jonschz 2024-11-23 20:25:55 +01:00
parent affc85a3f4
commit 30621a6ee8
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoinputmanager.h" #include "legoinputmanager.h"
#include "legomain.h"
#include "legosoundmanager.h" #include "legosoundmanager.h"
#include "legoutils.h" #include "legoutils.h"
#include "misc.h" #include "misc.h"
@ -1254,7 +1255,7 @@ void LegoCarBuild::FUN_10024ef0()
m_buildState->m_animationState = LegoVehicleBuildState::e_cutscene; m_buildState->m_animationState = LegoVehicleBuildState::e_cutscene;
FUN_10025720(FUN_10025d70()); FUN_10025720(FUN_10025d70());
m_buildState->m_unk0x4c += 1; m_buildState->m_unk0x4c += 1;
FUN_10015820(FALSE, 7); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10024f30 // FUNCTION: LEGO1 0x10024f30

13
LEGO1/lego/legoomni/src/race/carrace.cpp
View File

@ -1,12 +1,14 @@
#include "carrace.h" #include "carrace.h"
#include "actions/carrace_actions.h" #include "actions/carrace_actions.h"
#include "actions/jukebox_actions.h"
#include "dunebuggy.h" #include "dunebuggy.h"
#include "isle.h" #include "isle.h"
#include "legoanimationmanager.h" #include "legoanimationmanager.h"
#include "legobackgroundcolor.h" #include "legobackgroundcolor.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legohideanimpresenter.h" #include "legohideanimpresenter.h"
#include "legomain.h"
#include "legonavcontroller.h" #include "legonavcontroller.h"
#include "legopathstruct.h" #include "legopathstruct.h"
#include "legoracers.h" #include "legoracers.h"
@ -106,8 +108,7 @@ MxResult CarRace::Create(MxDSAction& p_dsAction)
InvokeAction(Extra::e_start, m_atomId, streamId, NULL); InvokeAction(Extra::e_start, m_atomId, streamId, NULL);
InvokeAction(Extra::e_start, m_atomId, CarraceScript::c_RaceCarDashboard, NULL); InvokeAction(Extra::e_start, m_atomId, CarraceScript::c_RaceCarDashboard, NULL);
// TODO return result;
return SUCCESS;
} }
// FUNCTION: LEGO1 0x10016dd0 // FUNCTION: LEGO1 0x10016dd0
@ -120,11 +121,11 @@ void CarRace::ReadyWorld()
MxDSAction action; MxDSAction action;
action.SetAtomId(*g_jukeboxScript); action.SetAtomId(*g_jukeboxScript);
action.SetObjectId(16); action.SetObjectId(JukeboxScript::c_RaceTrackRoad_Music);
BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating); BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating);
AnimationManager()->Resume(); AnimationManager()->Resume();
FUN_10015820(FALSE, 7); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
m_unk0x144 = g_unk0x100d5d10[rand() & 7]; m_unk0x144 = g_unk0x100d5d10[rand() & 7];
@ -264,7 +265,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
break; break;
} }
FUN_10017820(0xb, paramData); FUN_10017820(11, paramData);
m_unk0x108 = paramData; m_unk0x108 = paramData;
if (m_unk0x108 == 0x14) { if (m_unk0x108 == 0x14) {
@ -291,7 +292,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
break; break;
} }
FUN_10017820(0xc, paramData); FUN_10017820(12, paramData);
m_unk0x10c = paramData; m_unk0x10c = paramData;

4
LEGO1/lego/legoomni/src/race/jetskirace.cpp
View File

@ -220,7 +220,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
break; break;
} }
FUN_10016930(0xb, paramData); FUN_10016930(11, paramData);
m_unk0x108 = paramData; m_unk0x108 = paramData;
if (m_unk0x108 == 0x14) { if (m_unk0x108 == 0x14) {
@ -238,7 +238,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
break; break;
} }
FUN_10016930(0xc, paramData); FUN_10016930(12, paramData);
m_unk0x10c = paramData; m_unk0x10c = paramData;