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

Merge branch 'actions-fwd-decl' of https://github.com/Ramen2X/isle into actions-fwd-decl

Browse Source
This commit is contained in:
Ramen2X 2024-03-19 15:39:01 -04:00
commit 323f342996
7 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/hospital.h
View File

@ -1,6 +1,7 @@
#ifndef HOSPITAL_H #ifndef HOSPITAL_H
#define HOSPITAL_H #define HOSPITAL_H
#include "actionsfwd.h"
#include "decomp.h" #include "decomp.h"
#include "hospitalstate.h" #include "hospitalstate.h"
#include "legogamestate.h" #include "legogamestate.h"
@ -8,15 +9,6 @@
#include "mxstillpresenter.h" #include "mxstillpresenter.h"
#include "radio.h" #include "radio.h"
namespace HospitalScript
{
#ifdef COMPAT_MODE
enum Script : int;
#else
enum Script;
#endif
} // namespace HospitalScript
// VTABLE: LEGO1 0x100d9730 // VTABLE: LEGO1 0x100d9730
// SIZE 0x12c // SIZE 0x12c
class Hospital : public LegoWorld { class Hospital : public LegoWorld {

10
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -1,6 +1,7 @@
#ifndef INFOCENTER_H #ifndef INFOCENTER_H
#define INFOCENTER_H #define INFOCENTER_H
#include "actionsfwd.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoworld.h" #include "legoworld.h"
#include "mxrect32.h" #include "mxrect32.h"
@ -10,15 +11,6 @@ class InfocenterState;
class MxStillPresenter; class MxStillPresenter;
class LegoControlManagerEvent; class LegoControlManagerEvent;
namespace InfomainScript
{
#ifdef COMPAT_MODE
enum Script : int;
#else
enum Script;
#endif
} // namespace InfomainScript
// SIZE 0x18 // SIZE 0x18
struct InfocenterMapEntry { struct InfocenterMapEntry {
// FUNCTION: LEGO1 0x1006ec80 // FUNCTION: LEGO1 0x1006ec80

10
LEGO1/lego/legoomni/include/jukeboxentity.h
View File

@ -1,17 +1,9 @@
#ifndef JUKEBOXENTITY_H #ifndef JUKEBOXENTITY_H
#define JUKEBOXENTITY_H #define JUKEBOXENTITY_H
#include "actionsfwd.h"
#include "legoentity.h" #include "legoentity.h"
namespace JukeboxScript
{
#ifdef COMPAT_MODE
enum Script : int;
#else
enum Script;
#endif
} // namespace JukeboxScript
// VTABLE: LEGO1 0x100da8a0 // VTABLE: LEGO1 0x100da8a0
// SIZE 0x6c // SIZE 0x6c
class JukeBoxEntity : public LegoEntity { class JukeBoxEntity : public LegoEntity {

6
LEGO1/lego/legoomni/include/legocharactermanager.h
View File

@ -19,9 +19,6 @@ struct LegoCharacterComparator {
// SIZE 0x08 // SIZE 0x08
struct LegoCharacter { struct LegoCharacter {
LegoROI* m_roi; // 0x00
MxU32 m_refCount; // 0x04
LegoCharacter(LegoROI* p_roi) LegoCharacter(LegoROI* p_roi)
{ {
m_roi = p_roi; m_roi = p_roi;
@ -29,6 +26,9 @@ struct LegoCharacter {
} }
inline void AddRef() { m_refCount++; } inline void AddRef() { m_refCount++; }
LegoROI* m_roi; // 0x00
MxU32 m_refCount; // 0x04
}; };
typedef map<const char*, LegoCharacter*, LegoCharacterComparator> LegoCharacterMap; typedef map<const char*, LegoCharacter*, LegoCharacterComparator> LegoCharacterMap;

10
LEGO1/lego/legoomni/include/legogamestate.h
View File

@ -1,6 +1,7 @@
#ifndef LEGOGAMESTATE_H #ifndef LEGOGAMESTATE_H
#define LEGOGAMESTATE_H #define LEGOGAMESTATE_H
#include "actionsfwd.h"
#include "decomp.h" #include "decomp.h"
#include "legobackgroundcolor.h" #include "legobackgroundcolor.h"
#include "legofullscreenmovie.h" #include "legofullscreenmovie.h"
@ -17,15 +18,6 @@ struct ColorStringStruct {
const char* m_colorName; const char* m_colorName;
}; };
namespace JukeboxScript
{
#ifdef COMPAT_MODE
enum Script : int;
#else
enum Script;
#endif
} // namespace JukeboxScript
// SIZE 0x430 // SIZE 0x430
class LegoGameState { class LegoGameState {
public: public:

3
LEGO1/lego/legoomni/include/misc.h
View File

@ -1,9 +1,10 @@
#ifndef MISC_H #ifndef MISC_H
#define MISC_H #define MISC_H
#include "actionsfwd.h"
#include "compat.h" #include "compat.h"
#include "decomp.h" #include "decomp.h"
// Long include path due to dependency of misc library on LegoOmni
#include "lego/legoomni/include/actions/actionsfwd.h"
#include "mxtypes.h" #include "mxtypes.h"
class IslePathActor; class IslePathActor;

10
LEGO1/lego/legoomni/include/policestate.h
View File

@ -1,19 +1,11 @@
#ifndef POLICESTATE_H #ifndef POLICESTATE_H
#define POLICESTATE_H #define POLICESTATE_H
#include "actionsfwd.h"
#include "decomp.h" #include "decomp.h"
#include "legostate.h" #include "legostate.h"
#include "police.h" #include "police.h"
namespace PoliceScript
{
#ifdef COMPAT_MODE
enum Script : int;
#else
enum Script;
#endif
} // namespace PoliceScript
// VTABLE: LEGO1 0x100d8af0 // VTABLE: LEGO1 0x100d8af0
// SIZE 0x10 // SIZE 0x10
class PoliceState : public LegoState { class PoliceState : public LegoState {