mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor script enum structure (#649)

Browse Source 
* add autogenerated action headers

* refactor police

* refactor infocenter

* refactor jukebox

* refactor regbook

* format

* scope headers in namespaces instead

* attempt to dynamically build headers ignore list in ncc

* correct whitespace in naming.yml

* fix wrong folder

* fix accidental extra newline in cmakelists
This commit is contained in:
Ramen2X
2024-03-10 12:08:21 -04:00
committed by GitHub
parent 6972142923
commit 7fad763699
44 changed files with 8125 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/src/police/policestate.cpp
View File

@@ -15,7 +15,7 @@ DECOMP_SIZE_ASSERT(PoliceState, 0x10)
PoliceState::PoliceState()
{
m_unk0x0c = 0;
m_policeScript = (rand() % 2 == 0) ? Police::PoliceScript::c_lauraAnim : Police::PoliceScript::c_nickAnim;
m_policeScript = (rand() % 2 == 0) ? PoliceScript::c_nps002la_RunAnim : PoliceScript::c_nps001ni_RunAnim;
}
// FUNCTION: LEGO1 0x1005e990
@@ -29,7 +29,7 @@ MxResult PoliceState::VTable0x1c(LegoFile* p_legoFile)
p_legoFile->Read(&m_policeScript, sizeof(m_policeScript));
}
else {
Police::PoliceScript policeScript = m_policeScript;
PoliceScript::Script policeScript = m_policeScript;
p_legoFile->Write(&policeScript, sizeof(m_policeScript));
}
@@ -39,7 +39,7 @@ MxResult PoliceState::VTable0x1c(LegoFile* p_legoFile)
// FUNCTION: LEGO1 0x1005ea40
void PoliceState::FUN_1005ea40()
{
Police::PoliceScript policeScript;
PoliceScript::Script policeScript;
if (m_unk0x0c == 1) {
return;
@@ -47,17 +47,17 @@ void PoliceState::FUN_1005ea40()
switch (CurrentActor()->GetActorId()) {
case 4:
policeScript = Police::PoliceScript::c_lauraAnim;
policeScript = PoliceScript::c_nps002la_RunAnim;
m_policeScript = policeScript;
break;
case 5:
policeScript = Police::PoliceScript::c_nickAnim;
policeScript = PoliceScript::c_nps001ni_RunAnim;
m_policeScript = policeScript;
break;
default:
policeScript = m_policeScript;
m_policeScript = policeScript == Police::PoliceScript::c_lauraAnim ? Police::PoliceScript::c_nickAnim
: Police::PoliceScript::c_lauraAnim;
m_policeScript = policeScript == PoliceScript::c_nps002la_RunAnim ? PoliceScript::c_nps001ni_RunAnim
: PoliceScript::c_nps002la_RunAnim;
}
{