isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-26 09:41:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Refactor globals into class statics

Browse Source
This commit is contained in:
Christian Semmler 2024-10-28 10:47:03 -07:00
parent 37f098157c
commit ecdca1db04
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/lego/legoomni/include/pizza.h
View File

@ -146,6 +146,18 @@ class PizzaMissionState : public LegoState {
undefined4 m_unk0x0c; // 0x0c undefined4 m_unk0x0c; // 0x0c
Mission m_missions[5]; // 0x10 Mission m_missions[5]; // 0x10
MxU32 m_unk0xb0; // 0xb0 MxU32 m_unk0xb0; // 0xb0
static IsleScript::Script g_pepperActions[];
static IsleScript::Script g_mamaActions[];
static IsleScript::Script g_papaActions[];
static IsleScript::Script g_nickActions[];
static IsleScript::Script g_lauraActions[];
static MxLong g_pepperFinishTimes[];
static MxLong g_mamaFinishTimes[];
static MxLong g_papaFinishTimes[];
static MxLong g_nickFinishTimes[];
static MxLong g_lauraFinishTimes[];
}; };
// VTABLE: LEGO1 0x100d7380 // VTABLE: LEGO1 0x100d7380

7
LEGO1/lego/legoomni/include/pizzeria.h
View File

@ -1,6 +1,7 @@
#ifndef PIZZERIA_H #ifndef PIZZERIA_H
#define PIZZERIA_H #define PIZZERIA_H
#include "actionsfwd.h"
#include "decomp.h" #include "decomp.h"
#include "isleactor.h" #include "isleactor.h"
#include "legostate.h" #include "legostate.h"
@ -38,6 +39,12 @@ class PizzeriaState : public LegoState {
Playlist m_unk0x08[5]; // 0x08 Playlist m_unk0x08[5]; // 0x08
MxS32 m_unk0x44[5]; // 0x44 MxS32 m_unk0x44[5]; // 0x44
static IsleScript::Script g_pepperActions[];
static IsleScript::Script g_mamaActions[];
static IsleScript::Script g_papaActions[];
static IsleScript::Script g_nickActions[];
static IsleScript::Script g_lauraActions[];
}; };
// VTABLE: LEGO1 0x100d5520 // VTABLE: LEGO1 0x100d5520

20
LEGO1/lego/legoomni/src/actors/pizza.cpp
View File

@ -25,7 +25,7 @@ DECOMP_SIZE_ASSERT(PizzaMissionState::Mission, 0x20)
extern MxU32 g_isleFlags; extern MxU32 g_isleFlags;
// GLOBAL: LEGO1 0x100f3a80 // GLOBAL: LEGO1 0x100f3a80
IsleScript::Script g_pepperActions[] = { IsleScript::Script PizzaMissionState::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,
@ -42,10 +42,10 @@ IsleScript::Script g_pepperActions[] = {
}; };
// GLOBAL: LEGO1 0x100f3ab8 // GLOBAL: LEGO1 0x100f3ab8
MxLong g_pepperFinishTimes[] = {100000, 200000, 300000, 350000}; MxLong PizzaMissionState::g_pepperFinishTimes[] = {100000, 200000, 300000, 350000};
// GLOBAL: LEGO1 0x100f3ac8 // GLOBAL: LEGO1 0x100f3ac8
IsleScript::Script g_lauraActions[] = { IsleScript::Script PizzaMissionState::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,
@ -62,10 +62,10 @@ IsleScript::Script g_lauraActions[] = {
}; };
// GLOBAL: LEGO1 0x100f3b00 // GLOBAL: LEGO1 0x100f3b00
MxLong g_lauraFinishTimes[] = {100000, 200000, 300000, 350000}; MxLong PizzaMissionState::g_lauraFinishTimes[] = {100000, 200000, 300000, 350000};
// GLOBAL: LEGO1 0x100f3b10 // GLOBAL: LEGO1 0x100f3b10
IsleScript::Script g_nickActions[] = { IsleScript::Script PizzaMissionState::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,
@ -82,10 +82,10 @@ IsleScript::Script g_nickActions[] = {
}; };
// GLOBAL: LEGO1 0x100f3b48 // GLOBAL: LEGO1 0x100f3b48
MxLong g_nickFinishTimes[] = {100000, 200000, 300000, 350000}; MxLong PizzaMissionState::g_nickFinishTimes[] = {100000, 200000, 300000, 350000};
// GLOBAL: LEGO1 0x100f3b58 // GLOBAL: LEGO1 0x100f3b58
IsleScript::Script g_mamaActions[] = { IsleScript::Script PizzaMissionState::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,
@ -102,10 +102,10 @@ IsleScript::Script g_mamaActions[] = {
}; };
// GLOBAL: LEGO1 0x100f3b90 // GLOBAL: LEGO1 0x100f3b90
MxLong g_mamaFinishTimes[] = {100000, 200000, 300000, 350000}; MxLong PizzaMissionState::g_mamaFinishTimes[] = {100000, 200000, 300000, 350000};
// GLOBAL: LEGO1 0x100f3ba0 // GLOBAL: LEGO1 0x100f3ba0
IsleScript::Script g_papaActions[] = { IsleScript::Script PizzaMissionState::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,
@ -122,7 +122,7 @@ IsleScript::Script g_papaActions[] = {
}; };
// GLOBAL: LEGO1 0x100f3bd8 // GLOBAL: LEGO1 0x100f3bd8
MxLong g_papaFinishTimes[] = {100000, 200000, 300000, 350000}; MxLong PizzaMissionState::g_papaFinishTimes[] = {100000, 200000, 300000, 350000};
// FUNCTION: LEGO1 0x10037ef0 // FUNCTION: LEGO1 0x10037ef0
Pizza::Pizza() Pizza::Pizza()

10
LEGO1/lego/legoomni/src/actors/pizzeria.cpp
View File

@ -15,23 +15,23 @@ DECOMP_SIZE_ASSERT(Pizzeria, 0x84)
DECOMP_SIZE_ASSERT(PizzeriaState, 0x58) DECOMP_SIZE_ASSERT(PizzeriaState, 0x58)
// GLOBAL: LEGO1 0x100f0ce8 // GLOBAL: LEGO1 0x100f0ce8
IsleScript::Script g_pepperActions[] = IsleScript::Script PizzeriaState::g_pepperActions[] =
{IsleScript::c_ppz107ma_RunAnim, IsleScript::c_ppz114pa_RunAnim, IsleScript::c_ppz114pa_RunAnim}; {IsleScript::c_ppz107ma_RunAnim, IsleScript::c_ppz114pa_RunAnim, IsleScript::c_ppz114pa_RunAnim};
// GLOBAL: LEGO1 0x100f0cf8 // GLOBAL: LEGO1 0x100f0cf8
IsleScript::Script g_mamaActions[] = IsleScript::Script PizzeriaState::g_mamaActions[] =
{IsleScript::c_ppz001pe_RunAnim, IsleScript::c_ppz006pa_RunAnim, IsleScript::c_ppz007pa_RunAnim}; {IsleScript::c_ppz001pe_RunAnim, IsleScript::c_ppz006pa_RunAnim, IsleScript::c_ppz007pa_RunAnim};
// GLOBAL: LEGO1 0x100f0d08 // GLOBAL: LEGO1 0x100f0d08
IsleScript::Script g_papaActions[] = IsleScript::Script PizzeriaState::g_papaActions[] =
{IsleScript::c_ppz054ma_RunAnim, IsleScript::c_ppz055ma_RunAnim, IsleScript::c_ppz056ma_RunAnim}; {IsleScript::c_ppz054ma_RunAnim, IsleScript::c_ppz055ma_RunAnim, IsleScript::c_ppz056ma_RunAnim};
// GLOBAL: LEGO1 0x100f0d18 // GLOBAL: LEGO1 0x100f0d18
IsleScript::Script g_nickActions[] = IsleScript::Script PizzeriaState::g_nickActions[] =
{IsleScript::c_ppz031ma_RunAnim, IsleScript::c_ppz035pa_RunAnim, IsleScript::c_ppz036pa_RunAnim}; {IsleScript::c_ppz031ma_RunAnim, IsleScript::c_ppz035pa_RunAnim, IsleScript::c_ppz036pa_RunAnim};
// GLOBAL: LEGO1 0x100f0d28 // GLOBAL: LEGO1 0x100f0d28
IsleScript::Script g_lauraActions[] = IsleScript::Script PizzeriaState::g_lauraActions[] =
{IsleScript::c_ppz075pa_RunAnim, IsleScript::c_ppz082pa_RunAnim, IsleScript::c_ppz084pa_RunAnim}; {IsleScript::c_ppz075pa_RunAnim, IsleScript::c_ppz082pa_RunAnim, IsleScript::c_ppz084pa_RunAnim};
// FUNCTION: LEGO1 0x100179c0 // FUNCTION: LEGO1 0x100179c0