From 3ed6c58701cf7e60b3cabb870848839d46df5ad4 Mon Sep 17 00:00:00 2001 From: Fabian Neundorf Date: Thu, 31 Jul 2025 18:03:06 +0200 Subject: [PATCH] Clear unknowns in `PizzaMissionState` and `Pizza` (#1662) --- LEGO1/lego/legoomni/include/pizza.h | 26 +++-- LEGO1/lego/legoomni/src/actors/pizza.cpp | 98 +++++++++---------- LEGO1/lego/legoomni/src/actors/pizzeria.cpp | 4 +- LEGO1/lego/legoomni/src/actors/skateboard.cpp | 2 +- LEGO1/lego/legoomni/src/worlds/isle.cpp | 4 +- 5 files changed, 73 insertions(+), 61 deletions(-) diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h index b81b76f8..134f9656 100644 --- a/LEGO1/lego/legoomni/include/pizza.h +++ b/LEGO1/lego/legoomni/include/pizza.h @@ -37,7 +37,7 @@ public: m_unk0x08 = 1; m_finishTimes = p_finishTimes; m_startTime = INT_MIN; - m_unk0x14 = 1; + m_counter = 1; m_score = LegoState::e_grey; m_hiScore = LegoState::e_grey; m_actions = p_actions; @@ -52,7 +52,7 @@ public: m_unk0x08 = p_mission.m_unk0x08; m_finishTimes = p_mission.m_finishTimes; m_startTime = p_mission.m_startTime; - m_unk0x14 = p_mission.m_unk0x14; + m_counter = p_mission.m_counter; m_score = p_mission.m_score; m_hiScore = p_mission.m_hiScore; m_actions = p_mission.m_actions; @@ -100,12 +100,24 @@ public: undefined m_unk0x08; // 0x08 MxLong* m_finishTimes; // 0x0c MxLong m_startTime; // 0x10 - MxS16 m_unk0x14; // 0x14 + MxS16 m_counter; // 0x14 MxS16 m_score; // 0x16 MxS16 m_hiScore; // 0x18 IsleScript::Script* m_actions; // 0x1c }; + enum { + e_none = 0, + e_introduction = 1, + e_waitAcceptingQuest = 2, + e_started = 3, + e_delivering = 4, + e_arrivedAtDestination = 5, + e_suggestHelicopter = 6, + e_transitionToAct2 = 8, + e_timeoutAcceptingQuest = 9, + }; + PizzaMissionState(); // FUNCTION: LEGO1 0x10039290 @@ -140,7 +152,7 @@ public: MxS16 GetActorState(); PizzeriaState* m_pizzeriaState; // 0x08 - undefined4 m_unk0x0c; // 0x0c + MxU32 m_state; // 0x0c Mission m_missions[5]; // 0x10 MxU32 m_playedAction; // 0xb0 @@ -187,8 +199,8 @@ public: MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0x80 void CreateState(); - void FUN_10038220(IsleScript::Script p_objectId); - void FUN_100382b0(); + void Start(IsleScript::Script p_objectId); + void Reset(); void StopActions(); void PlayAction(MxU32 p_objectId, MxBool p_param7); @@ -205,7 +217,7 @@ private: IsleScript::Script m_speechAction; // 0x8c MxLong m_startTime; // 0x90 MxLong m_duration; // 0x94 - MxBool m_unk0x98; // 0x98 + MxBool m_playedLocationAnimation; // 0x98 }; #endif // PIZZA_H diff --git a/LEGO1/lego/legoomni/src/actors/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp index 422cf87f..291969cf 100644 --- a/LEGO1/lego/legoomni/src/actors/pizza.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizza.cpp @@ -137,7 +137,7 @@ Pizza::Pizza() m_skateBoard = NULL; m_act1state = NULL; m_speechAction = IsleScript::c_noneIsle; - m_unk0x98 = FALSE; + m_playedLocationAnimation = FALSE; m_startTime = INT_MIN; } @@ -177,11 +177,11 @@ void Pizza::CreateState() // FUNCTION: LEGO1 0x10038220 // FUNCTION: BETA10 0x100edb81 -void Pizza::FUN_10038220(IsleScript::Script p_objectId) +void Pizza::Start(IsleScript::Script p_objectId) { AnimationManager()->FUN_10064740(NULL); m_mission = m_state->GetMission(GameState()->GetActorId()); - m_state->m_unk0x0c = 1; + m_state->m_state = PizzaMissionState::e_introduction; m_act1state->m_state = Act1State::e_pizza; m_mission->m_startTime = INT_MIN; g_isleFlags &= ~Isle::c_playMusic; @@ -193,22 +193,22 @@ void Pizza::FUN_10038220(IsleScript::Script p_objectId) // FUNCTION: LEGO1 0x100382b0 // FUNCTION: BETA10 0x100edc9b -void Pizza::FUN_100382b0() +void Pizza::Reset() { - if (m_state->m_unk0x0c != 8) { + if (m_state->m_state != PizzaMissionState::e_transitionToAct2) { if (m_speechAction != IsleScript::c_noneIsle) { InvokeAction(Extra::e_stop, *g_isleScript, m_speechAction, NULL); } m_act1state->m_state = Act1State::e_none; - m_state->m_unk0x0c = 0; + m_state->m_state = PizzaMissionState::e_none; UserActor()->SetActorState(LegoPathActor::c_initial); g_isleFlags |= Isle::c_playMusic; AnimationManager()->EnableCamAnims(TRUE); AnimationManager()->FUN_1005f6d0(TRUE); m_mission->m_startTime = INT_MIN; m_mission = NULL; - m_unk0x98 = FALSE; + m_playedLocationAnimation = FALSE; m_speechAction = IsleScript::c_noneIsle; BackgroundAudioManager()->RaiseVolume(); TickleManager()->UnregisterClient(this); @@ -237,14 +237,14 @@ void Pizza::StopActions() // FUNCTION: BETA10 0x100edd10 MxLong Pizza::HandleClick() { - if (m_state->m_unk0x0c == 1) { - m_state->m_unk0x0c = 2; + if (m_state->m_state == PizzaMissionState::e_introduction) { + m_state->m_state = PizzaMissionState::e_waitAcceptingQuest; m_mission->m_startTime = Timer()->GetTime(); TickleManager()->RegisterClient(this, 200); AnimationManager()->FUN_10061010(FALSE); } - if (m_state->m_unk0x0c == 2) { + if (m_state->m_state == PizzaMissionState::e_waitAcceptingQuest) { m_act1state->m_state = Act1State::e_pizza; if (m_skateBoard == NULL) { @@ -266,7 +266,7 @@ MxLong Pizza::HandleClick() } PlayAction(action, TRUE); - m_state->m_unk0x0c = 3; + m_state->m_state = PizzaMissionState::e_started; PlayMusic(JukeboxScript::c_PizzaMission_Music); return 1; } @@ -278,12 +278,12 @@ MxLong Pizza::HandleClick() // FUNCTION: BETA10 0x100ede53 MxLong Pizza::HandlePathStruct(LegoPathStructNotificationParam& p_param) { - if (m_state->m_unk0x0c == 4) { + if (m_state->m_state == PizzaMissionState::e_delivering) { 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->m_state = PizzaMissionState::e_arrivedAtDestination; m_state->SetPlayedAction(SndanimScript::c_TRS302_OpenJailDoor); if (time < m_mission->GetRedFinishTime()) { @@ -348,20 +348,20 @@ MxLong Pizza::HandlePathStruct(LegoPathStructNotificationParam& p_param) break; } - m_state->m_unk0x0c = 5; + m_state->m_state = PizzaMissionState::e_arrivedAtDestination; PlayAction(action, TRUE); MxTrace("Pizza mission: ending\n"); } else if (p_param.GetTrigger() == LegoPathStruct::c_w) { if (p_param.GetData() == 0x15e && GameState()->GetActorId() == LegoActor::c_pepper) { - if (!m_unk0x98) { - m_unk0x98 = TRUE; + if (!m_playedLocationAnimation) { + m_playedLocationAnimation = 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; + else if (p_param.GetData() == 0x15f && GameState()->GetActorId() == LegoActor::c_papa && !m_playedLocationAnimation) { + m_playedLocationAnimation = TRUE; InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_wns050p1_RunAnim, NULL); } } @@ -384,13 +384,13 @@ MxResult Pizza::Tickle() } if (m_mission != NULL && m_mission->m_startTime != INT_MIN) { - if (m_state->m_unk0x0c == 4) { + if (m_state->m_state == PizzaMissionState::e_delivering) { assert(m_mission); if (time > m_mission->m_startTime + m_mission->GetTimeoutTime()) { StopActions(); m_mission->UpdateScore(LegoState::e_grey); - FUN_100382b0(); + Reset(); BackgroundAudioManager()->LowerVolume(); InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Avo917In_PlayWav, NULL); MxTrace("Pizza mission: timeout, stop\n"); @@ -421,7 +421,7 @@ MxResult Pizza::Tickle() } } } - else if (m_state->m_unk0x0c == 2) { + else if (m_state->m_state == PizzaMissionState::e_waitAcceptingQuest) { assert(m_mission); if (Timer()->GetTime() > m_mission->m_startTime + 5000) { @@ -429,7 +429,7 @@ MxResult Pizza::Tickle() m_skateBoard->EnableScenePresentation(FALSE); TickleManager()->UnregisterClient(this); m_mission->UpdateScore(LegoState::e_grey); - m_state->m_unk0x0c = 9; + m_state->m_state = PizzaMissionState::e_timeoutAcceptingQuest; AnimationManager()->FUN_1005f6d0(TRUE); PlayAction(m_mission->GetUnknownFinishAction(), TRUE); MxTrace("Pizza mission: timeout, declining\n"); @@ -452,16 +452,16 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) return 1; } - switch (m_state->m_unk0x0c) { - case 1: + switch (m_state->m_state) { + case PizzaMissionState::e_introduction: if (m_state->GetPlayedAction() == objectId) { - m_state->m_unk0x0c = 2; + m_state->m_state = PizzaMissionState::e_waitAcceptingQuest; m_mission->m_startTime = Timer()->GetTime(); TickleManager()->RegisterClient(this, 200); MxTrace("Pizza mission: proposed\n"); } break; - case 3: + case PizzaMissionState::e_started: if (m_state->GetPlayedAction() == objectId) { m_mission->m_startTime = Timer()->GetTime(); @@ -470,7 +470,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) InvokeAction(Extra::e_start, *g_isleScript, mission->GetActions()[i], NULL); } - m_state->m_unk0x0c = 4; + m_state->m_state = PizzaMissionState::e_delivering; m_state->SetPlayedAction(IsleScript::c_noneIsle); UserActor()->SetActorState(LegoPathActor::c_initial); m_skateBoard->SetPizzaVisible(TRUE); @@ -489,7 +489,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) result = 1; } break; - case 5: + case PizzaMissionState::e_arrivedAtDestination: if (m_state->GetPlayedAction() == objectId) { StopActions(); @@ -497,26 +497,26 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) IsleScript::Script action = IsleScript::c_noneIsle; if (!((Isle*) CurrentWorld())->HasHelicopter()) { - switch (m_mission->m_unk0x14) { + switch (m_mission->m_counter) { case 1: action = IsleScript::c_pja126br_RunAnim; - m_mission->m_unk0x14++; - m_state->m_unk0x0c = 6; + m_mission->m_counter++; + m_state->m_state = PizzaMissionState::e_suggestHelicopter; MxTrace("Pizza mission: succeeds\n"); break; case 2: action = IsleScript::c_pja129br_RunAnim; m_startTime = Timer()->GetTime(); m_duration = 500; - m_mission->m_unk0x14++; - m_state->m_unk0x0c = 6; + m_mission->m_counter++; + m_state->m_state = PizzaMissionState::e_suggestHelicopter; MxTrace("Pizza mission: succeeds\n"); break; case 3: action = IsleScript::c_pja131br_RunAnim; m_startTime = Timer()->GetTime(); m_duration = 500; - m_state->m_unk0x0c = 6; + m_state->m_state = PizzaMissionState::e_suggestHelicopter; break; } } @@ -524,7 +524,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) action = IsleScript::c_pja132br_RunAnim; m_startTime = Timer()->GetTime(); m_duration = 2300; - m_state->m_unk0x0c = 8; + m_state->m_state = PizzaMissionState::e_transitionToAct2; InputManager()->DisableInputProcessing(); InputManager()->SetUnknown336(TRUE); MxTrace("Pizza mission: go to Act2\n"); @@ -533,42 +533,42 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param) PlayAction(action, TRUE); } else { - FUN_100382b0(); - m_state->m_unk0x0c = 0; + Reset(); + m_state->m_state = PizzaMissionState::e_none; m_state->SetPlayedAction(IsleScript::c_noneIsle); } } break; - case 6: + case PizzaMissionState::e_suggestHelicopter: if (m_state->GetPlayedAction() == objectId) { if (objectId == IsleScript::c_pja126br_RunAnim) { - PlayAction(IsleScript::c_pja127br_RunAnim, TRUE); + PlayAction(IsleScript::c_pja127br_RunAnim, TRUE); // build helicopter! m_startTime = Timer()->GetTime(); m_duration = 700; } else if (objectId == IsleScript::c_pja129br_RunAnim) { - PlayAction(IsleScript::c_pja130br_RunAnim, TRUE); + PlayAction(IsleScript::c_pja130br_RunAnim, TRUE); // build helicopter! } else { - FUN_100382b0(); - m_state->m_unk0x0c = 0; + Reset(); + m_state->m_state = PizzaMissionState::e_none; m_state->SetPlayedAction(IsleScript::c_noneIsle); } } break; - case 8: + case PizzaMissionState::e_transitionToAct2: if (m_state->GetPlayedAction() == objectId) { m_act1state->m_state = Act1State::e_none; - m_state->m_unk0x0c = 0; + m_state->m_state = PizzaMissionState::e_none; GameState()->m_currentArea = LegoGameState::e_isle; TickleManager()->UnregisterClient(this); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_act2main); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); } break; - case 9: + case PizzaMissionState::e_timeoutAcceptingQuest: if (m_state->GetPlayedAction() == objectId) { - FUN_100382b0(); + Reset(); } break; } @@ -594,7 +594,7 @@ void Pizza::PlayAction(MxU32 p_objectId, MxBool p_param7) // FUNCTION: BETA10 0x100eea25 PizzaMissionState::PizzaMissionState() { - m_unk0x0c = 0; + m_state = PizzaMissionState::e_none; 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, 4); m_missions[2] = Mission(LegoActor::c_papa, 2, g_papaFinishTimes, g_papaActions, 4); @@ -613,7 +613,7 @@ MxResult PizzaMissionState::Serialize(LegoStorage* p_storage) if (p_storage->IsReadMode()) { for (MxS16 i = 0; i < 5; i++) { p_storage->ReadS16(m_missions[i].m_unk0x06); - p_storage->ReadS16(m_missions[i].m_unk0x14); + p_storage->ReadS16(m_missions[i].m_counter); p_storage->ReadS16(m_missions[i].m_score); p_storage->ReadS16(m_missions[i].m_hiScore); } @@ -621,7 +621,7 @@ MxResult PizzaMissionState::Serialize(LegoStorage* p_storage) else if (p_storage->IsWriteMode()) { for (MxS16 i = 0; i < 5; i++) { p_storage->WriteS16(m_missions[i].m_unk0x06); - p_storage->WriteS16(m_missions[i].m_unk0x14); + p_storage->WriteS16(m_missions[i].m_counter); p_storage->WriteS16(m_missions[i].m_score); p_storage->WriteS16(m_missions[i].m_hiScore); } diff --git a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp index 3b5f8923..b9aa6edc 100644 --- a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp @@ -69,7 +69,7 @@ void Pizzeria::CreateState() // FUNCTION: BETA10 0x100efc91 MxLong Pizzeria::HandleClick() { - if (CanExit() && m_pizzaMissionState->m_unk0x0c == 0) { + if (CanExit() && m_pizzaMissionState->m_state == PizzaMissionState::e_none) { if (UserActor()->GetActorId() != GameState()->GetActorId()) { if (!UserActor()->IsA("SkateBoard")) { ((IslePathActor*) UserActor())->Exit(); @@ -79,7 +79,7 @@ MxLong Pizzeria::HandleClick() AnimationManager()->FUN_10061010(FALSE); Pizza* pizza = (Pizza*) CurrentWorld()->Find(*g_isleScript, IsleScript::c_Pizza_Actor); - pizza->FUN_10038220((IsleScript::Script) m_pizzeriaState->NextAction()); + pizza->Start((IsleScript::Script) m_pizzeriaState->NextAction()); } return 1; diff --git a/LEGO1/lego/legoomni/src/actors/skateboard.cpp b/LEGO1/lego/legoomni/src/actors/skateboard.cpp index 17730148..70d1be72 100644 --- a/LEGO1/lego/legoomni/src/actors/skateboard.cpp +++ b/LEGO1/lego/legoomni/src/actors/skateboard.cpp @@ -59,7 +59,7 @@ void SkateBoard::Exit() if (m_act1state->m_state == Act1State::e_pizza) { Pizza* pizza = (Pizza*) CurrentWorld()->Find(*g_isleScript, IsleScript::c_Pizza_Actor); pizza->StopActions(); - pizza->FUN_100382b0(); + pizza->Reset(); m_pizzaVisible = FALSE; } diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index cb57171b..e4f0ea99 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -1212,7 +1212,7 @@ MxBool Isle::Escape() case Act1State::e_pizza: if (UserActor() != NULL) { m_pizza->StopActions(); - m_pizza->FUN_100382b0(); + m_pizza->Reset(); } break; case Act1State::e_towtrack: @@ -1279,7 +1279,7 @@ void Isle::SwitchToInfocenter() if (m_act1state->m_state == Act1State::e_pizza) { if (UserActor() != NULL) { m_pizza->StopActions(); - m_pizza->FUN_100382b0(); + m_pizza->Reset(); } }