isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 07:28:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/match Pizza::HandlePathStruct (#1122)

Browse source
This commit is contained in:
Christian Semmler 2024-10-28 08:53:09 -07:00 committed by GitHub
parent 139da31628
commit 2fa2ab4a96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 178 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
LEGO1/lego/legoomni/include/pizza.h
View file

@ -37,8 +37,8 @@ class PizzaMissionState : public LegoState {
m_finishTimes = p_finishTimes; m_finishTimes = p_finishTimes;
m_startTime = INT_MIN; m_startTime = INT_MIN;
m_unk0x14 = 1; m_unk0x14 = 1;
m_unk0x16 = 0; m_score = LegoState::e_grey;
m_score = 0; m_hiScore = LegoState::e_grey;
m_actions = p_actions; m_actions = p_actions;
} }
@ -52,19 +52,43 @@ class PizzaMissionState : public LegoState {
m_finishTimes = p_mission.m_finishTimes; m_finishTimes = p_mission.m_finishTimes;
m_startTime = p_mission.m_startTime; m_startTime = p_mission.m_startTime;
m_unk0x14 = p_mission.m_unk0x14; m_unk0x14 = p_mission.m_unk0x14;
m_unk0x16 = p_mission.m_unk0x16;
m_score = p_mission.m_score; m_score = p_mission.m_score;
m_hiScore = p_mission.m_hiScore;
m_actions = p_mission.m_actions; m_actions = p_mission.m_actions;
m_numActions = p_mission.m_numActions; m_numActions = p_mission.m_numActions;
return *this; return *this;
} }
// FUNCTION: BETA10 0x100ef610
IsleScript::Script GetRedFinishAction() { return m_actions[m_numActions + 6]; }
// FUNCTION: BETA10 0x100ef640
IsleScript::Script GetBlueFinishAction() { return m_actions[m_numActions + 7]; }
// FUNCTION: BETA10 0x100ef670
IsleScript::Script GetYellowFinishAction() { return m_actions[m_numActions + 8]; }
// FUNCTION: BETA10 0x100ef6a0
MxLong GetRedFinishTime() { return m_finishTimes[0]; }
// FUNCTION: BETA10 0x100ef6d0
MxLong GetBlueFinishTime() { return m_finishTimes[1]; }
// FUNCTION: BETA10 0x100ef700
void UpdateScore(ScoreColor p_score)
{
m_score = p_score;
if (m_hiScore < p_score) {
m_hiScore = p_score;
}
}
MxResult WriteToFile(LegoFile* p_file) MxResult WriteToFile(LegoFile* p_file)
{ {
Write(p_file, m_unk0x06); Write(p_file, m_unk0x06);
Write(p_file, m_unk0x14); Write(p_file, m_unk0x14);
Write(p_file, m_unk0x16);
Write(p_file, m_score); Write(p_file, m_score);
Write(p_file, m_hiScore);
return SUCCESS; return SUCCESS;
} }
@ -72,8 +96,8 @@ class PizzaMissionState : public LegoState {
{ {
Read(p_file, &m_unk0x06); Read(p_file, &m_unk0x06);
Read(p_file, &m_unk0x14); Read(p_file, &m_unk0x14);
Read(p_file, &m_unk0x16);
Read(p_file, &m_score); Read(p_file, &m_score);
Read(p_file, &m_hiScore);
return SUCCESS; return SUCCESS;
} }
@ -85,8 +109,8 @@ class PizzaMissionState : public LegoState {
MxLong* m_finishTimes; // 0x0c MxLong* m_finishTimes; // 0x0c
MxLong m_startTime; // 0x10 MxLong m_startTime; // 0x10
MxS16 m_unk0x14; // 0x14 MxS16 m_unk0x14; // 0x14
MxS16 m_unk0x16; // 0x16 MxS16 m_score; // 0x16
MxS16 m_score; // 0x18 MxS16 m_hiScore; // 0x18
IsleScript::Script* m_actions; // 0x1c IsleScript::Script* m_actions; // 0x1c
}; };
@ -110,7 +134,7 @@ class PizzaMissionState : public LegoState {
// FUNCTION: BETA10 0x100ef470 // FUNCTION: BETA10 0x100ef470
void SetUnknown0xb0(undefined4 p_unk0xb0) { m_unk0xb0 = p_unk0xb0; } void SetUnknown0xb0(undefined4 p_unk0xb0) { m_unk0xb0 = p_unk0xb0; }
MxS16 GetHighScore(MxU8 p_actorId) { return GetMission(p_actorId)->m_score; } MxS16 GetHighScore(MxU8 p_actorId) { return GetMission(p_actorId)->m_hiScore; }
// SYNTHETIC: LEGO1 0x10039350 // SYNTHETIC: LEGO1 0x10039350
// PizzaMissionState::`scalar deleting destructor' // PizzaMissionState::`scalar deleting destructor'
@ -155,7 +179,7 @@ class Pizza : public IsleActor {
void FUN_10038220(MxU32 p_objectId); void FUN_10038220(MxU32 p_objectId);
void FUN_100382b0(); void FUN_100382b0();
void StopActions(); void StopActions();
void FUN_10038fe0(MxU32 p_objectId, MxBool); void PlayAction(MxU32 p_objectId, MxBool);
void SetSkateboard(SkateBoard* p_skateBoard) { m_skateBoard = p_skateBoard; } void SetSkateboard(SkateBoard* p_skateBoard) { m_skateBoard = p_skateBoard; }
@ -168,7 +192,7 @@ class Pizza : public IsleActor {
SkateBoard* m_skateBoard; // 0x84 SkateBoard* m_skateBoard; // 0x84
Act1State* m_act1state; // 0x88 Act1State* m_act1state; // 0x88
undefined4 m_unk0x8c; // 0x8c undefined4 m_unk0x8c; // 0x8c
undefined4 m_unk0x90; // 0x90 MxLong m_unk0x90; // 0x90
undefined4 m_unk0x94; // 0x94 undefined4 m_unk0x94; // 0x94
MxBool m_unk0x98; // 0x98 MxBool m_unk0x98; // 0x98
}; };

159
LEGO1/lego/legoomni/src/actors/pizza.cpp
View file

@ -28,7 +28,16 @@ IsleScript::Script g_pepperActions[] = {
IsleScript::c_pnsx48pr_RunAnim, IsleScript::c_pnsx48pr_RunAnim,
IsleScript::c_pnsx69pr_RunAnim, IsleScript::c_pnsx69pr_RunAnim,
IsleScript::c_pns125ni_RunAnim, IsleScript::c_pns125ni_RunAnim,
IsleScript::c_pns122pr_RunAnim IsleScript::c_pns122pr_RunAnim,
IsleScript::c_noneIsle,
IsleScript::c_noneIsle,
IsleScript::c_ppz120pa_RunAnim,
IsleScript::c_ppz117ma_RunAnim,
IsleScript::c_ppz118ma_RunAnim,
IsleScript::c_ppz119ma_RunAnim,
IsleScript::c_nja001pr_RunAnim,
IsleScript::c_nja001pr_RunAnim,
IsleScript::c_nja001pr_RunAnim
}; };
// GLOBAL: LEGO1 0x100f3ab8 // GLOBAL: LEGO1 0x100f3ab8
@ -39,7 +48,16 @@ IsleScript::Script g_lauraActions[] = {
IsleScript::c_pns096pr_RunAnim, IsleScript::c_pns096pr_RunAnim,
IsleScript::c_pns097pr_RunAnim, IsleScript::c_pns097pr_RunAnim,
IsleScript::c_pns098pr_RunAnim, IsleScript::c_pns098pr_RunAnim,
IsleScript::c_pns099pr_RunAnim IsleScript::c_pns099pr_RunAnim,
IsleScript::c_noneIsle,
IsleScript::c_ppz086bs_RunAnim,
IsleScript::c_ppz090ma_RunAnim,
IsleScript::c_ppz088ma_RunAnim,
IsleScript::c_ppz089ma_RunAnim,
IsleScript::c_ppz095pe_RunAnim,
IsleScript::c_pho104re_RunAnim,
IsleScript::c_pho105re_RunAnim,
IsleScript::c_pho106re_RunAnim
}; };
// GLOBAL: LEGO1 0x100f3b00 // GLOBAL: LEGO1 0x100f3b00
@ -50,7 +68,16 @@ IsleScript::Script g_nickActions[] = {
IsleScript::c_pns042bm_RunAnim, IsleScript::c_pns042bm_RunAnim,
IsleScript::c_pns043en_RunAnim, IsleScript::c_pns043en_RunAnim,
IsleScript::c_pns045p1_RunAnim, IsleScript::c_pns045p1_RunAnim,
IsleScript::c_pns048pr_RunAnim IsleScript::c_pns048pr_RunAnim,
IsleScript::c_ppz029rd_RunAnim,
IsleScript::c_noneIsle,
IsleScript::c_ppz038ma_RunAnim,
IsleScript::c_ppz037ma_RunAnim,
IsleScript::c_ppz037ma_RunAnim,
IsleScript::c_ppz037ma_RunAnim,
IsleScript::c_pgs050nu_RunAnim,
IsleScript::c_pgs051nu_RunAnim,
IsleScript::c_pgs052nu_RunAnim
}; };
// GLOBAL: LEGO1 0x100f3b48 // GLOBAL: LEGO1 0x100f3b48
@ -61,7 +88,16 @@ IsleScript::Script g_mamaActions[] = {
IsleScript::c_pns022pr_RunAnim, IsleScript::c_pns022pr_RunAnim,
IsleScript::c_pns021dl_RunAnim, IsleScript::c_pns021dl_RunAnim,
IsleScript::c_pns018rd_RunAnim, IsleScript::c_pns018rd_RunAnim,
IsleScript::c_pns019pr_RunAnim IsleScript::c_pns019pr_RunAnim,
IsleScript::c_ppz008rd_RunAnim,
IsleScript::c_noneIsle,
IsleScript::c_ppz013pa_RunAnim,
IsleScript::c_ppz010pa_RunAnim,
IsleScript::c_ppz011pa_RunAnim,
IsleScript::c_ppz016pe_RunAnim,
IsleScript::c_pps025ni_RunAnim,
IsleScript::c_pps026ni_RunAnim,
IsleScript::c_pps027ni_RunAnim
}; };
// GLOBAL: LEGO1 0x100f3b90 // GLOBAL: LEGO1 0x100f3b90
@ -72,7 +108,16 @@ IsleScript::Script g_papaActions[] = {
IsleScript::c_pns065rd_RunAnim, IsleScript::c_pns065rd_RunAnim,
IsleScript::c_pns066db_RunAnim, IsleScript::c_pns066db_RunAnim,
IsleScript::c_pns067gd_RunAnim, IsleScript::c_pns067gd_RunAnim,
IsleScript::c_pns069pr_RunAnim IsleScript::c_pns069pr_RunAnim,
IsleScript::c_noneIsle,
IsleScript::c_noneIsle,
IsleScript::c_ppz061ma_RunAnim,
IsleScript::c_ppz059ma_RunAnim,
IsleScript::c_ppz060ma_RunAnim,
IsleScript::c_ppz064ma_RunAnim,
IsleScript::c_prt072sl_RunAnim,
IsleScript::c_prt073sl_RunAnim,
IsleScript::c_prt074sl_RunAnim
}; };
// GLOBAL: LEGO1 0x100f3bd8 // GLOBAL: LEGO1 0x100f3bd8
@ -136,7 +181,7 @@ void Pizza::FUN_10038220(MxU32 p_objectId)
g_isleFlags &= ~Isle::c_playMusic; g_isleFlags &= ~Isle::c_playMusic;
AnimationManager()->EnableCamAnims(FALSE); AnimationManager()->EnableCamAnims(FALSE);
AnimationManager()->FUN_1005f6d0(FALSE); AnimationManager()->FUN_1005f6d0(FALSE);
FUN_10038fe0(p_objectId, FALSE); PlayAction(p_objectId, FALSE);
m_unk0x8c = -1; m_unk0x8c = -1;
} }
@ -211,7 +256,7 @@ MxLong Pizza::HandleClick()
action = m_mission->m_actions[m_mission->m_numActions + 5]; action = m_mission->m_actions[m_mission->m_numActions + 5];
} }
FUN_10038fe0(action, TRUE); PlayAction(action, TRUE);
m_state->m_unk0x0c = 3; m_state->m_unk0x0c = 3;
PlayMusic(JukeboxScript::c_PizzaMission_Music); PlayMusic(JukeboxScript::c_PizzaMission_Music);
return 1; return 1;
@ -220,11 +265,95 @@ MxLong Pizza::HandleClick()
return 0; return 0;
} }
// STUB: LEGO1 0x100384f0 // FUNCTION: LEGO1 0x100384f0
// FUNCTION: BETA10 0x100ede53 // FUNCTION: BETA10 0x100ede53
MxLong Pizza::HandlePathStruct(LegoPathStructNotificationParam& p_param) MxLong Pizza::HandlePathStruct(LegoPathStructNotificationParam& p_param)
{ {
// TODO if (m_state->m_unk0x0c == 4) {
MxLong time = Timer()->GetTime() - m_mission->m_startTime;
if (p_param.GetTrigger() == LegoPathStruct::c_s && p_param.GetData() == 0x12e &&
GameState()->GetActorId() == LegoActor::c_pepper) {
m_state->m_unk0x0c = 5;
m_state->SetUnknown0xb0(0x12e);
if (time < m_mission->GetRedFinishTime()) {
m_mission->UpdateScore(LegoState::e_red);
}
else if (time < m_mission->GetBlueFinishTime()) {
m_mission->UpdateScore(LegoState::e_blue);
}
else {
m_mission->UpdateScore(LegoState::e_yellow);
}
}
else if ((p_param.GetTrigger() == LegoPathStruct::c_camAnim && (
((p_param.GetData() == 0x24 || p_param.GetData() == 0x22) && GameState()->GetActorId() == LegoActor::c_mama) ||
(p_param.GetData() == 0x33 && GameState()->GetActorId() == LegoActor::c_papa) ||
((p_param.GetData() == 0x08 || p_param.GetData() == 0x09) && GameState()->GetActorId() == LegoActor::c_nick) ||
(p_param.GetData() == 0x0b && GameState()->GetActorId() == LegoActor::c_laura)
)) || (p_param.GetTrigger() == LegoPathStruct::c_w && p_param.GetData() == 0x169 && GameState()->GetActorId() == LegoActor::c_nick)) {
IsleScript::Script action;
if (time < m_mission->GetRedFinishTime()) {
action = m_mission->GetRedFinishAction();
m_mission->UpdateScore(LegoState::e_red);
}
else if (time < m_mission->GetBlueFinishTime()) {
action = m_mission->GetBlueFinishAction();
m_mission->UpdateScore(LegoState::e_blue);
}
else {
action = m_mission->GetYellowFinishAction();
m_mission->UpdateScore(LegoState::e_yellow);
}
StopActions();
switch (action) {
case IsleScript::c_pps025ni_RunAnim:
case IsleScript::c_pps026ni_RunAnim:
case IsleScript::c_pps027ni_RunAnim:
m_unk0x90 = Timer()->GetTime();
m_unk0x94 = 3800;
break;
case IsleScript::c_pgs050nu_RunAnim:
case IsleScript::c_pgs051nu_RunAnim:
case IsleScript::c_pgs052nu_RunAnim:
m_unk0x90 = Timer()->GetTime();
m_unk0x94 = 6400;
break;
case IsleScript::c_prt072sl_RunAnim:
case IsleScript::c_prt073sl_RunAnim:
case IsleScript::c_prt074sl_RunAnim:
m_unk0x90 = Timer()->GetTime();
m_unk0x94 = 7000;
break;
case IsleScript::c_pho104re_RunAnim:
case IsleScript::c_pho105re_RunAnim:
case IsleScript::c_pho106re_RunAnim:
m_unk0x90 = Timer()->GetTime();
m_unk0x94 = 6500;
break;
}
m_state->m_unk0x0c = 5;
PlayAction(action, TRUE);
}
else if (p_param.GetTrigger() == LegoPathStruct::c_w) {
if (p_param.GetData() == 0x15e && GameState()->GetActorId() == LegoActor::c_pepper) {
if (!m_unk0x98) {
m_unk0x98 = TRUE;
InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_pns050p1_RunAnim, NULL);
}
}
else if (p_param.GetData() == 0x15f && GameState()->GetActorId() == LegoActor::c_papa && !m_unk0x98) {
m_unk0x98 = TRUE;
InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_wns050p1_RunAnim, NULL);
}
}
}
return 0; return 0;
} }
@ -243,7 +372,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam&)
} }
// STUB: LEGO1 0x10038fe0 // STUB: LEGO1 0x10038fe0
void Pizza::FUN_10038fe0(MxU32 p_objectId, MxBool) void Pizza::PlayAction(MxU32 p_objectId, MxBool)
{ {
// TODO // TODO
} }
@ -253,11 +382,11 @@ void Pizza::FUN_10038fe0(MxU32 p_objectId, MxBool)
PizzaMissionState::PizzaMissionState() PizzaMissionState::PizzaMissionState()
{ {
m_unk0x0c = 0; m_unk0x0c = 0;
m_missions[0] = Mission(LegoActor::c_pepper, 2, g_pepperFinishTimes, g_pepperActions, sizeOfArray(g_pepperActions)); m_missions[0] = Mission(LegoActor::c_pepper, 2, g_pepperFinishTimes, g_pepperActions, 4);
m_missions[1] = Mission(LegoActor::c_mama, 2, g_mamaFinishTimes, g_mamaActions, sizeOfArray(g_mamaActions)); m_missions[1] = Mission(LegoActor::c_mama, 2, g_mamaFinishTimes, g_mamaActions, 4);
m_missions[2] = Mission(LegoActor::c_papa, 2, g_papaFinishTimes, g_papaActions, sizeOfArray(g_papaActions)); m_missions[2] = Mission(LegoActor::c_papa, 2, g_papaFinishTimes, g_papaActions, 4);
m_missions[3] = Mission(LegoActor::c_nick, 2, g_nickFinishTimes, g_nickActions, sizeOfArray(g_nickActions)); m_missions[3] = Mission(LegoActor::c_nick, 2, g_nickFinishTimes, g_nickActions, 4);
m_missions[4] = Mission(LegoActor::c_laura, 2, g_lauraFinishTimes, g_lauraActions, sizeOfArray(g_lauraActions)); m_missions[4] = Mission(LegoActor::c_laura, 2, g_lauraFinishTimes, g_lauraActions, 4);
m_pizzeriaState = (PizzeriaState*) GameState()->GetState("PizzeriaState"); m_pizzeriaState = (PizzeriaState*) GameState()->GetState("PizzeriaState");
m_unk0xb0 = -1; m_unk0xb0 = -1;
} }