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

Replace magic values

Browse Source
This commit is contained in:
Christian Semmler 2024-03-19 16:00:43 -04:00
parent 3316fa9b53
commit f78bbf4391
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
LEGO1/lego/legoomni/src/actors/bike.cpp
View File

@ -1,5 +1,6 @@
#include "bike.h" #include "bike.h"
#include "isle_actions.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoomni.h" #include "legoomni.h"
@ -35,11 +36,11 @@ void Bike::VTable0xe4()
{ {
IslePathActor::VTable0xe4(); IslePathActor::VTable0xe4();
GameState()->SetCurrentArea(LegoGameState::Area::e_bike); GameState()->SetCurrentArea(LegoGameState::Area::e_bike);
RemoveFromCurrentWorld(*g_isleScript, 11); RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeDashboard_Bitmap);
RemoveFromCurrentWorld(*g_isleScript, 12); RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeArms_Ctl);
RemoveFromCurrentWorld(*g_isleScript, 15); RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeHorn_Ctl);
RemoveFromCurrentWorld(*g_isleScript, 14); RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeHorn_Sound);
RemoveFromCurrentWorld(*g_isleScript, 13); RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeInfo_Ctl);
ControlManager()->Unregister(this); ControlManager()->Unregister(this);
} }

14
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -79,13 +79,13 @@ void Helicopter::VTable0xe4()
} }
m_state->SetUnknown8(0); m_state->SetUnknown8(0);
RemoveFromCurrentWorld(m_script, 0x16); RemoveFromCurrentWorld(m_script, IsleScript::c_HelicopterDashboard_Bitmap);
RemoveFromCurrentWorld(m_script, 0x17); RemoveFromCurrentWorld(m_script, IsleScript::c_HelicopterArms_Ctl);
RemoveFromCurrentWorld(m_script, 0x18); RemoveFromCurrentWorld(m_script, IsleScript::c_Helicopter_TakeOff_Ctl);
RemoveFromCurrentWorld(m_script, 0x19); RemoveFromCurrentWorld(m_script, IsleScript::c_Helicopter_Land_Ctl);
RemoveFromCurrentWorld(m_script, 0x1a); RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Pizza_Ctl);
RemoveFromCurrentWorld(m_script, 0x1b); RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Donut_Ctl);
RemoveFromCurrentWorld(m_script, 0x1c); RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Info_Ctl);
RemoveFromCurrentWorld(m_script, 0x1d); RemoveFromCurrentWorld(m_script, 0x1d);
RemoveFromCurrentWorld(m_script, 0x1e); RemoveFromCurrentWorld(m_script, 0x1e);
RemoveFromCurrentWorld(m_script, 0x1f); RemoveFromCurrentWorld(m_script, 0x1f);

1
LEGO1/lego/legoomni/src/common/legoutils.cpp
View File

@ -242,6 +242,7 @@ void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bO
MxBool RemoveFromCurrentWorld(MxAtomId& p_atomId, MxS32 p_id) MxBool RemoveFromCurrentWorld(MxAtomId& p_atomId, MxS32 p_id)
{ {
LegoWorld* world = CurrentWorld(); LegoWorld* world = CurrentWorld();
if (world) { if (world) {
MxCore* object = world->Find(p_atomId, p_id); MxCore* object = world->Find(p_atomId, p_id);