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

Cleanup, add BETA10

Browse Source
This commit is contained in:
jonschz 2024-11-16 13:53:32 +01:00
parent 75f3670c28
commit 0836402d03
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/jetskirace.h
View File

@ -71,6 +71,10 @@ class JetskiRace : public LegoRace {
}; };
// SYNTHETIC: LEGO1 0x1000f530 // SYNTHETIC: LEGO1 0x1000f530
// SYNTHETIC: BETA10 0x100a9b70
// JetskiRace::`scalar deleting destructor' // JetskiRace::`scalar deleting destructor'
// SYNTHETIC: BETA10 0x100aa150
// JetskiRace::~JetskiRace
#endif // JETSKIRACE_H #endif // JETSKIRACE_H

3
LEGO1/lego/legoomni/include/legopathstruct.h
View File

@ -28,7 +28,10 @@ class LegoPathStructNotificationParam : public MxNotificationParam {
return new LegoPathStructNotificationParam(m_type, m_sender, m_trigger, m_data); return new LegoPathStructNotificationParam(m_type, m_sender, m_trigger, m_data);
} // vtable+0x04 } // vtable+0x04
// FUNCTION: BETA10 0x10024270
MxU8 GetTrigger() { return m_trigger; } MxU8 GetTrigger() { return m_trigger; }
// FUNCTION: BETA10 0x100242a0
MxS16 GetData() { return m_data; } MxS16 GetData() { return m_data; }
protected: protected:

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

@ -172,6 +172,7 @@ inline MxS32 JetskiRace::PossiblyGetPlaceOfPlayer()
} }
// FUNCTION: LEGO1 0x100166a0 // FUNCTION: LEGO1 0x100166a0
// FUNCTION: BETA10 0x100c8085
MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param) MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
{ {
LegoChar buffer[20]; LegoChar buffer[20];
@ -285,26 +286,26 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
// FUNCTION: LEGO1 0x10016930 // FUNCTION: LEGO1 0x10016930
void JetskiRace::FUN_10016930(MxS32 p_param1, MxS16 p_param2) void JetskiRace::FUN_10016930(MxS32 p_param1, MxS16 p_param2)
{ {
MxS32 local_4; MxS32 local4;
MxStillPresenter* piVar1; MxStillPresenter* presenter;
MxS32 x, y; MxS32 x, y;
if (p_param1 == 11) { if (p_param1 == 11) {
piVar1 = m_unk0x128; presenter = m_unk0x128;
local_4 = m_unk0xfc; local4 = m_unk0xfc;
} }
else if (p_param1 == 12) { else if (p_param1 == 12) {
piVar1 = m_unk0x12c; presenter = m_unk0x12c;
local_4 = m_unk0x100; local4 = m_unk0x100;
} }
if (piVar1) { if (presenter) {
x = m_unk0x130.GetLeft() + 0.5 + x = m_unk0x130.GetLeft() + 0.5 +
(m_unk0x130.GetRight() - m_unk0x130.GetLeft() + 1) * (local_4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); (m_unk0x130.GetRight() - m_unk0x130.GetLeft() + 1) * (local4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0);
y = m_unk0x130.GetTop() + 0.5 + y = m_unk0x130.GetTop() + 0.5 +
(m_unk0x130.GetBottom() - m_unk0x130.GetTop() + 1) * (local_4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0); (m_unk0x130.GetBottom() - m_unk0x130.GetTop() + 1) * (local4 * 20.0 + p_param2) / (g_unk0x100f0c78 * 20.0);
piVar1->SetPosition(x, y); presenter->SetPosition(x, y);
} }
} }