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

Address review comments, part 1

Browse Source
This commit is contained in:
jonschz 2024-11-23 20:22:14 +01:00
parent 93ce1f7b7b
commit affc85a3f4
4 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/carrace.h
View File

@ -72,11 +72,11 @@ class CarRace : public LegoRace {
// CarRace::`scalar deleting destructor' // CarRace::`scalar deleting destructor'
private: private:
static const MxS32 g_unk0x100d5d10[]; static MxS32 g_unk0x100d5d10[];
static const MxS32 g_unk0x100d5d30[]; static MxS32 g_unk0x100d5d30[];
static const MxS32 g_unk0x100d5d40[]; static MxS32 g_unk0x100d5d40[];
static const MxS32 g_unk0x100d5d50[]; static MxS32 g_unk0x100d5d50[];
static const MxS32 g_unk0x100d5d60[]; static MxS32 g_unk0x100d5d60[];
MxS32 m_unk0x144; // 0x144 MxS32 m_unk0x144; // 0x144
MxS32 m_unk0x148; // 0x148 MxS32 m_unk0x148; // 0x148

7
LEGO1/lego/legoomni/include/legoinputmanager.h
View File

@ -132,13 +132,6 @@ class LegoInputManager : public MxPresenter {
void GetKeyboardState(); void GetKeyboardState();
MxResult GetNavigationKeyStates(MxU32& p_keyFlags); MxResult GetNavigationKeyStates(MxU32& p_keyFlags);
void Reset88and336()
{
// This function is hypothesized based on LEGO1 0x100173f5
m_unk0x88 = TRUE;
m_unk0x336 = FALSE;
}
// SYNTHETIC: LEGO1 0x1005b8d0 // SYNTHETIC: LEGO1 0x1005b8d0
// LegoInputManager::`scalar deleting destructor' // LegoInputManager::`scalar deleting destructor'

6
LEGO1/lego/legoomni/src/actors/doors.cpp
View File

@ -12,15 +12,15 @@ DECOMP_SIZE_ASSERT(Doors, 0x1f8)
// GLOBAL: LEGO1 0x100d8e7c // GLOBAL: LEGO1 0x100d8e7c
// GLOBAL: BETA10 0x101b954c // GLOBAL: BETA10 0x101b954c
const MxFloat g_unk0x100d8e7c = 1000.0f; MxFloat g_unk0x100d8e7c = 1000.0f;
// GLOBAL: LEGO1 0x100d8e80 // GLOBAL: LEGO1 0x100d8e80
// GLOBAL: BETA10 0x101b9550 // GLOBAL: BETA10 0x101b9550
const MxFloat g_unk0x100d8e80 = 4000.0f; MxFloat g_unk0x100d8e80 = 4000.0f;
// GLOBAL: LEGO1 0x100d8e84 // GLOBAL: LEGO1 0x100d8e84
// GLOBAL: BETA10 0x101b9554 // GLOBAL: BETA10 0x101b9554
const MxFloat g_unk0x100d8e84 = 6000.0f; MxFloat g_unk0x100d8e84 = 6000.0f;
// FUNCTION: LEGO1 0x10066100 // FUNCTION: LEGO1 0x10066100
// FUNCTION: BETA10 0x10026850 // FUNCTION: BETA10 0x10026850

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

@ -24,7 +24,7 @@
DECOMP_SIZE_ASSERT(CarRace, 0x154) DECOMP_SIZE_ASSERT(CarRace, 0x154)
// GLOBAL: LEGO1 0x100d5d10 // GLOBAL: LEGO1 0x100d5d10
const MxS32 CarRace::g_unk0x100d5d10[] = { MxS32 CarRace::g_unk0x100d5d10[] = {
CarraceScript::c_srt001sl_RunAnim, CarraceScript::c_srt001sl_RunAnim,
CarraceScript::c_srt002sl_RunAnim, CarraceScript::c_srt002sl_RunAnim,
CarraceScript::c_srt003sl_RunAnim, CarraceScript::c_srt003sl_RunAnim,
@ -36,7 +36,7 @@ const MxS32 CarRace::g_unk0x100d5d10[] = {
}; };
// GLOBAL: LEGO1 0x100d5d30 // GLOBAL: LEGO1 0x100d5d30
const MxS32 CarRace::g_unk0x100d5d30[] = { MxS32 CarRace::g_unk0x100d5d30[] = {
CarraceScript::c_srt011sl_RunAnim, CarraceScript::c_srt011sl_RunAnim,
CarraceScript::c_srt012sl_RunAnim, CarraceScript::c_srt012sl_RunAnim,
CarraceScript::c_srt013sl_RunAnim, CarraceScript::c_srt013sl_RunAnim,
@ -44,24 +44,24 @@ const MxS32 CarRace::g_unk0x100d5d30[] = {
}; };
// GLOBAL: LEGO1 0x100d5d40 // GLOBAL: LEGO1 0x100d5d40
const MxS32 CarRace::g_unk0x100d5d40[] = MxS32 CarRace::g_unk0x100d5d40[] =
{CarraceScript::c_srt015sl_RunAnim, CarraceScript::c_srt016sl_RunAnim, CarraceScript::c_srt017sl_RunAnim}; {CarraceScript::c_srt015sl_RunAnim, CarraceScript::c_srt016sl_RunAnim, CarraceScript::c_srt017sl_RunAnim};
// GLOBAL: LEGO1 0x100d5d50 // GLOBAL: LEGO1 0x100d5d50
const MxS32 CarRace::g_unk0x100d5d50[] = MxS32 CarRace::g_unk0x100d5d50[] =
{CarraceScript::c_srt007rh_RunAnim, CarraceScript::c_srt008rh_RunAnim, CarraceScript::c_srt009rh_RunAnim}; {CarraceScript::c_srt007rh_RunAnim, CarraceScript::c_srt008rh_RunAnim, CarraceScript::c_srt009rh_RunAnim};
// GLOBAL: LEGO1 0x100d5d60 // GLOBAL: LEGO1 0x100d5d60
const MxS32 CarRace::g_unk0x100d5d60[] = MxS32 CarRace::g_unk0x100d5d60[] =
{CarraceScript::c_srt010rh_RunAnim, CarraceScript::c_srt011rh_RunAnim, CarraceScript::c_srt012rh_RunAnim}; {CarraceScript::c_srt010rh_RunAnim, CarraceScript::c_srt011rh_RunAnim, CarraceScript::c_srt012rh_RunAnim};
// GLOBAL: LEGO1 0x100f0c70 // GLOBAL: LEGO1 0x100f0c70
// STRING: LEGO1 0x100f0c48 // STRING: LEGO1 0x100f0c48
const LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6"; LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6";
// GLOBAL: LEGO1 0x100f0c74 // GLOBAL: LEGO1 0x100f0c74
// STRING: LEGO1 0x100f0c3c // STRING: LEGO1 0x100f0c3c
const LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0"; LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0";
// GLOBAL: LEGO1 0x100f0c7c // GLOBAL: LEGO1 0x100f0c7c
static MxS32 g_unk0x100f0c7c = 2; static MxS32 g_unk0x100f0c7c = 2;
@ -237,7 +237,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
m_unk0x14c = g_unk0x100d5d50[rand() % 3]; m_unk0x14c = g_unk0x100d5d50[rand() % 3];
} }
InputManager()->Reset88and336(); InputManager()->DisableInputProcessing();
InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown336(TRUE);
VariableTable()->SetVariable(g_strHIT_WALL_SOUND, ""); VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
NavController()->SetDeadZone(NavController()->GetDefaultDeadZone()); NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());