diff --git a/LEGO1/lego/legoomni/include/carrace.h b/LEGO1/lego/legoomni/include/carrace.h index 9fc6d21c..03e7a958 100644 --- a/LEGO1/lego/legoomni/include/carrace.h +++ b/LEGO1/lego/legoomni/include/carrace.h @@ -72,11 +72,11 @@ class CarRace : public LegoRace { // CarRace::`scalar deleting destructor' private: - static const MxS32 g_unk0x100d5d10[]; - static const MxS32 g_unk0x100d5d30[]; - static const MxS32 g_unk0x100d5d40[]; - static const MxS32 g_unk0x100d5d50[]; - static const MxS32 g_unk0x100d5d60[]; + static MxS32 g_unk0x100d5d10[]; + static MxS32 g_unk0x100d5d30[]; + static MxS32 g_unk0x100d5d40[]; + static MxS32 g_unk0x100d5d50[]; + static MxS32 g_unk0x100d5d60[]; MxS32 m_unk0x144; // 0x144 MxS32 m_unk0x148; // 0x148 diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h index 0ba5bad7..8f2b0693 100644 --- a/LEGO1/lego/legoomni/include/legoinputmanager.h +++ b/LEGO1/lego/legoomni/include/legoinputmanager.h @@ -132,13 +132,6 @@ class LegoInputManager : public MxPresenter { void GetKeyboardState(); MxResult GetNavigationKeyStates(MxU32& p_keyFlags); - void Reset88and336() - { - // This function is hypothesized based on LEGO1 0x100173f5 - m_unk0x88 = TRUE; - m_unk0x336 = FALSE; - } - // SYNTHETIC: LEGO1 0x1005b8d0 // LegoInputManager::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/src/actors/doors.cpp b/LEGO1/lego/legoomni/src/actors/doors.cpp index 4acd14f2..3ff0306d 100644 --- a/LEGO1/lego/legoomni/src/actors/doors.cpp +++ b/LEGO1/lego/legoomni/src/actors/doors.cpp @@ -12,15 +12,15 @@ DECOMP_SIZE_ASSERT(Doors, 0x1f8) // GLOBAL: LEGO1 0x100d8e7c // GLOBAL: BETA10 0x101b954c -const MxFloat g_unk0x100d8e7c = 1000.0f; +MxFloat g_unk0x100d8e7c = 1000.0f; // GLOBAL: LEGO1 0x100d8e80 // GLOBAL: BETA10 0x101b9550 -const MxFloat g_unk0x100d8e80 = 4000.0f; +MxFloat g_unk0x100d8e80 = 4000.0f; // GLOBAL: LEGO1 0x100d8e84 // GLOBAL: BETA10 0x101b9554 -const MxFloat g_unk0x100d8e84 = 6000.0f; +MxFloat g_unk0x100d8e84 = 6000.0f; // FUNCTION: LEGO1 0x10066100 // FUNCTION: BETA10 0x10026850 diff --git a/LEGO1/lego/legoomni/src/race/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp index ec7dba05..deaa9387 100644 --- a/LEGO1/lego/legoomni/src/race/carrace.cpp +++ b/LEGO1/lego/legoomni/src/race/carrace.cpp @@ -24,7 +24,7 @@ DECOMP_SIZE_ASSERT(CarRace, 0x154) // GLOBAL: LEGO1 0x100d5d10 -const MxS32 CarRace::g_unk0x100d5d10[] = { +MxS32 CarRace::g_unk0x100d5d10[] = { CarraceScript::c_srt001sl_RunAnim, CarraceScript::c_srt002sl_RunAnim, CarraceScript::c_srt003sl_RunAnim, @@ -36,7 +36,7 @@ const MxS32 CarRace::g_unk0x100d5d10[] = { }; // GLOBAL: LEGO1 0x100d5d30 -const MxS32 CarRace::g_unk0x100d5d30[] = { +MxS32 CarRace::g_unk0x100d5d30[] = { CarraceScript::c_srt011sl_RunAnim, CarraceScript::c_srt012sl_RunAnim, CarraceScript::c_srt013sl_RunAnim, @@ -44,24 +44,24 @@ const MxS32 CarRace::g_unk0x100d5d30[] = { }; // GLOBAL: LEGO1 0x100d5d40 -const MxS32 CarRace::g_unk0x100d5d40[] = +MxS32 CarRace::g_unk0x100d5d40[] = {CarraceScript::c_srt015sl_RunAnim, CarraceScript::c_srt016sl_RunAnim, CarraceScript::c_srt017sl_RunAnim}; // GLOBAL: LEGO1 0x100d5d50 -const MxS32 CarRace::g_unk0x100d5d50[] = +MxS32 CarRace::g_unk0x100d5d50[] = {CarraceScript::c_srt007rh_RunAnim, CarraceScript::c_srt008rh_RunAnim, CarraceScript::c_srt009rh_RunAnim}; // GLOBAL: LEGO1 0x100d5d60 -const MxS32 CarRace::g_unk0x100d5d60[] = +MxS32 CarRace::g_unk0x100d5d60[] = {CarraceScript::c_srt010rh_RunAnim, CarraceScript::c_srt011rh_RunAnim, CarraceScript::c_srt012rh_RunAnim}; // GLOBAL: LEGO1 0x100f0c70 // STRING: LEGO1 0x100f0c48 -const LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6"; +LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6"; // GLOBAL: LEGO1 0x100f0c74 // STRING: LEGO1 0x100f0c3c -const LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0"; +LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0"; // GLOBAL: LEGO1 0x100f0c7c static MxS32 g_unk0x100f0c7c = 2; @@ -237,7 +237,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) m_unk0x14c = g_unk0x100d5d50[rand() % 3]; } - InputManager()->Reset88and336(); + InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); VariableTable()->SetVariable(g_strHIT_WALL_SOUND, ""); NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());