Name/rename functions in LegoCharacterManager (#982)

* Name/rename functions in LegoCharacterManager

* Name flag
This commit is contained in:
Christian Semmler
2024-06-01 12:45:34 -04:00
committed by GitHub
parent 375ac29b9b
commit 23e5ad7d15
16 changed files with 206 additions and 206 deletions

View File

@@ -1,5 +1,5 @@
#ifndef LEGOCHARACTERS_H
#define LEGOCHARACTERS_H
#ifndef LEGOACTORS_H
#define LEGOACTORS_H
#include "decomp.h"
#include "mxtypes.h"
@@ -8,7 +8,7 @@ class LegoExtraActor;
class LegoROI;
// SIZE 0x108
struct LegoCharacterInfo {
struct LegoActorInfo {
// SIZE 0x18
struct Part {
MxU8* m_unk0x00; // 0x00
@@ -29,7 +29,7 @@ struct LegoCharacterInfo {
};
// SIZE 0x58
struct LegoCharacterLOD {
struct LegoActorLOD {
enum {
c_flag1 = 0x01,
c_flag2 = 0x02
@@ -45,7 +45,7 @@ struct LegoCharacterLOD {
float m_up[3]; // 0x4c
};
enum LegoCharacterLODs {
enum LegoActorLODs {
c_topLOD,
c_bodyLOD,
c_infohatLOD,
@@ -59,7 +59,7 @@ enum LegoCharacterLODs {
c_legrtLOD
};
enum LegoCharacterParts {
enum LegoActorParts {
c_bodyPart,
c_infohatPart,
c_infogronPart,
@@ -72,7 +72,7 @@ enum LegoCharacterParts {
c_legrtPart
};
extern LegoCharacterInfo g_characterInfoInit[66];
extern LegoCharacterLOD g_characterLODs[11];
extern LegoActorInfo g_actorInfoInit[66];
extern LegoActorLOD g_actorLODs[11];
#endif // LEGOCHARACTERS_H
#endif // LEGOACTORS_H

View File

@@ -41,7 +41,7 @@ struct LegoCharacter {
MxU32 m_refCount; // 0x04
};
struct LegoCharacterInfo;
struct LegoActorInfo;
typedef map<char*, LegoCharacter*, LegoCharacterComparator> LegoCharacterMap;
@@ -53,32 +53,32 @@ public:
MxResult Write(LegoStorage* p_storage);
MxResult Read(LegoStorage* p_storage);
LegoROI* GetROI(const char* p_key, MxBool p_createEntity);
LegoROI* GetActorROI(const char* p_name, MxBool p_createEntity);
void Init();
static void SetCustomizeAnimFile(const char* p_value);
static MxBool Exists(const char* p_key);
static MxBool IsActor(const char* p_name);
void FUN_100832a0();
MxBool FUN_10083b20(const char* p_key);
void ReleaseAllActors();
MxBool Exists(const char* p_name);
MxU32 GetRefCount(LegoROI* p_roi);
void FUN_10083c30(const char* p_name);
void FUN_10083db0(LegoROI* p_roi);
void FUN_10083f10(LegoROI* p_roi);
void ReleaseActor(const char* p_name);
void ReleaseActor(LegoROI* p_roi);
void ReleaseAutoROI(LegoROI* p_roi);
MxBool FUN_100849a0(LegoROI* p_roi, LegoTextureInfo* p_textureInfo);
LegoExtraActor* GetActor(const char* p_key);
LegoCharacterInfo* GetInfo(const char* p_key);
LegoCharacterInfo* GetInfo(LegoROI* p_roi);
LegoExtraActor* GetExtraActor(const char* p_name);
LegoActorInfo* GetActorInfo(const char* p_name);
LegoActorInfo* GetActorInfo(LegoROI* p_roi);
MxBool SwitchHat(LegoROI* p_roi);
MxU32 FUN_10085140(LegoROI* p_roi, MxBool p_und);
MxU8 GetMood(LegoROI* p_roi);
LegoROI* FUN_10085210(const char* p_name, const char* p_lodName, MxBool p_createEntity);
LegoROI* CreateAutoROI(const char* p_name, const char* p_lodName, MxBool p_createEntity);
LegoROI* FUN_10085a80(const char* p_name, const char* p_lodName, MxBool p_createEntity);
static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; }
private:
LegoROI* CreateROI(const char* p_key);
LegoROI* CreateActorROI(const char* p_key);
void RemoveROI(LegoROI* p_roi);
LegoROI* FindChildROI(LegoROI* p_roi, const char* p_name);
MxResult FUN_10085870(LegoROI* p_roi);

View File

@@ -14,16 +14,16 @@ class Vector3;
class LegoEntity : public MxEntity {
public:
enum Type {
e_character = 0,
e_actor = 0,
e_unk1,
e_plant,
e_building,
e_unk4
e_autoROI
};
enum {
c_bit1 = 0x01,
c_bit2 = 0x02
c_managerOwned = 0x02
};
enum {