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

Match GasStation::ReadyWorld

Browse Source
This commit is contained in:
Christian Semmler 2025-01-05 10:22:01 -07:00
parent 5a3d730cce
commit af546e8b6e
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
LEGO1/lego/legoomni/src/worlds/gasstation.cpp
View File

@ -164,8 +164,6 @@ void GasStation::ReadyWorld()
if (m_state->m_pepperAction < 5) { if (m_state->m_pepperAction < 5) {
m_state->m_pepperAction++; m_state->m_pepperAction++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
case LegoActor::c_mama: case LegoActor::c_mama:
switch (m_state->m_mamaAction) { switch (m_state->m_mamaAction) {
@ -190,34 +188,6 @@ void GasStation::ReadyWorld()
if (m_state->m_mamaAction < 5) { if (m_state->m_mamaAction < 5) {
m_state->m_mamaAction++; m_state->m_mamaAction++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break;
case LegoActor::c_papa:
switch (m_state->m_papaAction) {
case 0:
m_state->m_unk0x14 = 5;
PlayAction(GarageScript::c_wgs012nu_RunAnim);
m_unk0x106 = 1;
break;
case 1:
m_state->m_unk0x14 = 5;
PlayAction(GarageScript::c_wgs014nu_RunAnim);
m_unk0x106 = 1;
break;
default:
m_state->m_unk0x14 = 6;
PlayAction(GarageScript::c_wgs017nu_RunAnim);
m_unk0x106 = 1;
m_unk0x104 = 1;
break;
}
if (m_state->m_papaAction < 5) {
m_state->m_papaAction++;
}
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
case LegoActor::c_nick: case LegoActor::c_nick:
switch (m_state->m_nickAction) { switch (m_state->m_nickAction) {
@ -242,8 +212,30 @@ void GasStation::ReadyWorld()
if (m_state->m_nickAction < 5) { if (m_state->m_nickAction < 5) {
m_state->m_nickAction++; m_state->m_nickAction++;
} }
break;
case LegoActor::c_papa:
switch (m_state->m_papaAction) {
case 0:
m_state->m_unk0x14 = 5;
PlayAction(GarageScript::c_wgs012nu_RunAnim);
m_unk0x106 = 1;
break;
case 1:
m_state->m_unk0x14 = 5;
PlayAction(GarageScript::c_wgs014nu_RunAnim);
m_unk0x106 = 1;
break;
default:
m_state->m_unk0x14 = 6;
PlayAction(GarageScript::c_wgs017nu_RunAnim);
m_unk0x106 = 1;
m_unk0x104 = 1;
break;
}
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); if (m_state->m_papaAction < 5) {
m_state->m_papaAction++;
}
break; break;
case LegoActor::c_laura: case LegoActor::c_laura:
switch (m_state->m_lauraAction) { switch (m_state->m_lauraAction) {
@ -268,13 +260,12 @@ void GasStation::ReadyWorld()
if (m_state->m_lauraAction < 5) { if (m_state->m_lauraAction < 5) {
m_state->m_lauraAction++; m_state->m_lauraAction++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
default: default:
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10005590 // FUNCTION: LEGO1 0x10005590