isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-02-16 19:50:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement/match LegoCharacterManager GetActor/Exists, fix loops (#750)

Browse source
This commit is contained in:
Christian Semmler 2024-03-29 13:30:46 -04:00 committed by GitHub
parent e260a407ba
commit ed1a25a636
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/legocharactermanager.h
View file

@ -47,18 +47,18 @@ public:
void Init(); void Init();
static void SetCustomizeAnimFile(const char* p_value); static void SetCustomizeAnimFile(const char* p_value);
static MxBool FUN_10084c00(const LegoChar*); static MxBool Exists(const char* p_key);
void FUN_100832a0(); void FUN_100832a0();
MxU32 GetRefCount(LegoROI* p_roi); MxU32 GetRefCount(LegoROI* p_roi);
void FUN_10083db0(LegoROI* p_roi); void FUN_10083db0(LegoROI* p_roi);
void FUN_10083f10(LegoROI* p_roi); void FUN_10083f10(LegoROI* p_roi);
LegoExtraActor* FUN_10084c40(const LegoChar*); LegoExtraActor* GetActor(const char* p_key);
LegoCharacterData* Find(const char* p_key); LegoCharacterData* GetData(const char* p_key);
MxBool FUN_10084ec0(LegoROI* p_roi); MxBool FUN_10084ec0(LegoROI* p_roi);
MxU32 FUN_10085140(LegoROI*, MxBool); MxU32 FUN_10085140(LegoROI*, MxBool);
LegoROI* FUN_10085210(const LegoChar*, LegoChar*, undefined); LegoROI* FUN_10085210(const char*, char*, undefined);
LegoROI* FUN_10085a80(LegoChar* p_und1, LegoChar* p_und2, undefined p_und3); LegoROI* FUN_10085a80(char* p_und1, char* p_und2, undefined p_und3);
static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; } static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; }

2
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View file

@ -427,7 +427,7 @@ MxResult LegoAnimationManager::StartEntityAction(MxDSAction& p_dsAction, LegoEnt
LegoROI* roi = p_entity->GetROI(); LegoROI* roi = p_entity->GetROI();
if (p_entity->GetUnknown0x59() == 0) { if (p_entity->GetUnknown0x59() == 0) {
LegoPathActor* actor = CharacterManager()->FUN_10084c40(roi->GetName()); LegoPathActor* actor = CharacterManager()->GetActor(roi->GetName());
if (actor) { if (actor) {
LegoPathController* controller = actor->GetController(); LegoPathController* controller = actor->GetController();

59
LEGO1/lego/legoomni/src/common/legocharactermanager.cpp
View file

@ -41,8 +41,8 @@ void LegoCharacterManager::Init()
// FUNCTION: LEGO1 0x100832a0 // FUNCTION: LEGO1 0x100832a0
void LegoCharacterManager::FUN_100832a0() void LegoCharacterManager::FUN_100832a0()
{ {
for (MxS32 i = 0; i < _countof(g_characterData) - 1; i++) { for (MxS32 i = 0; i < _countof(g_characterData); i++) {
LegoCharacterData* data = Find(g_characterData[i].m_name); LegoCharacterData* data = GetData(g_characterData[i].m_name);
if (data != NULL) { if (data != NULL) {
LegoExtraActor* actor = data->m_actor; LegoExtraActor* actor = data->m_actor;
@ -65,7 +65,7 @@ MxResult LegoCharacterManager::Write(LegoStorage* p_storage)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
for (MxS32 i = 0; i < _countof(g_characterData) - 1; i++) { for (MxS32 i = 0; i < _countof(g_characterData); i++) {
LegoCharacterData* data = &g_characterData[i]; LegoCharacterData* data = &g_characterData[i];
if (p_storage->Write(&data->m_unk0x0c, sizeof(data->m_unk0x0c)) != SUCCESS) { if (p_storage->Write(&data->m_unk0x0c, sizeof(data->m_unk0x0c)) != SUCCESS) {
@ -111,7 +111,7 @@ MxResult LegoCharacterManager::Read(LegoStorage* p_storage)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
for (MxS32 i = 0; i < _countof(g_characterData) - 1; i++) { for (MxS32 i = 0; i < _countof(g_characterData); i++) {
LegoCharacterData* data = &g_characterData[i]; LegoCharacterData* data = &g_characterData[i];
if (p_storage->Read(&data->m_unk0x0c, sizeof(data->m_unk0x0c)) != SUCCESS) { if (p_storage->Read(&data->m_unk0x0c, sizeof(data->m_unk0x0c)) != SUCCESS) {
@ -196,7 +196,7 @@ done:
actor->SetROI(character->m_roi, FALSE, FALSE); actor->SetROI(character->m_roi, FALSE, FALSE);
actor->FUN_100114e0(0); actor->FUN_100114e0(0);
actor->SetFlag(LegoActor::c_bit2); actor->SetFlag(LegoActor::c_bit2);
Find(p_key)->m_actor = actor; GetData(p_key)->m_actor = actor;
} }
return character->m_roi; return character->m_roi;
@ -248,21 +248,21 @@ LegoROI* LegoCharacterManager::CreateROI(const char* p_key)
Tgl::Renderer* renderer = VideoManager()->GetRenderer(); Tgl::Renderer* renderer = VideoManager()->GetRenderer();
ViewLODListManager* lodManager = GetViewLODListManager(); ViewLODListManager* lodManager = GetViewLODListManager();
LegoTextureContainer* textureContainer = TextureContainer(); LegoTextureContainer* textureContainer = TextureContainer();
LegoCharacterData* characterData = Find(p_key); LegoCharacterData* data = GetData(p_key);
if (characterData == NULL) { if (data == NULL) {
goto done; goto done;
} }
if (!strcmpi(p_key, "pep")) { if (!strcmpi(p_key, "pep")) {
LegoCharacterData* pepper = Find("pepper"); LegoCharacterData* pepper = GetData("pepper");
characterData->m_unk0x0c = pepper->m_unk0x0c; data->m_unk0x0c = pepper->m_unk0x0c;
characterData->m_unk0x10 = pepper->m_unk0x10; data->m_unk0x10 = pepper->m_unk0x10;
characterData->m_unk0x14 = pepper->m_unk0x14; data->m_unk0x14 = pepper->m_unk0x14;
for (i = 0; i < _countof(characterData->m_parts); i++) { for (i = 0; i < _countof(data->m_parts); i++) {
characterData->m_parts[i] = pepper->m_parts[i]; data->m_parts[i] = pepper->m_parts[i];
} }
} }
@ -293,7 +293,7 @@ LegoROI* LegoCharacterManager::CreateROI(const char* p_key)
const char* parentName; const char* parentName;
char lodName[64]; char lodName[64];
LegoCharacterData::Part& part = characterData->m_parts[i]; LegoCharacterData::Part& part = data->m_parts[i];
if (i == 0 || i == 1) { if (i == 0 || i == 1) {
parentName = part.m_unk0x04[part.m_unk0x00[part.m_unk0x08]]; parentName = part.m_unk0x04[part.m_unk0x00[part.m_unk0x08]];
@ -371,7 +371,7 @@ LegoROI* LegoCharacterManager::CreateROI(const char* p_key)
); );
roi->WrappedSetLocalTransform(mat); roi->WrappedSetLocalTransform(mat);
characterData->m_roi = roi; data->m_roi = roi;
success = TRUE; success = TRUE;
done: done:
@ -383,25 +383,36 @@ done:
return roi; return roi;
} }
// STUB: LEGO1 0x10084c00 // FUNCTION: LEGO1 0x10084c00
MxBool LegoCharacterManager::FUN_10084c00(const LegoChar*) MxBool LegoCharacterManager::Exists(const char* p_key)
{ {
// TODO for (MxU32 i = 0; i < _countof(g_characterData); i++) {
if (!strcmpi(g_characterData[i].m_name, p_key)) {
return TRUE;
}
}
return FALSE; return FALSE;
} }
// STUB: LEGO1 0x10084c40 // FUNCTION: LEGO1 0x10084c40
LegoExtraActor* LegoCharacterManager::FUN_10084c40(const LegoChar*) LegoExtraActor* LegoCharacterManager::GetActor(const char* p_key)
{ {
LegoCharacterData* data = GetData(p_key);
if (data != NULL) {
return data->m_actor;
}
return NULL; return NULL;
} }
// FUNCTION: LEGO1 0x10084c60 // FUNCTION: LEGO1 0x10084c60
LegoCharacterData* LegoCharacterManager::Find(const char* p_key) LegoCharacterData* LegoCharacterManager::GetData(const char* p_key)
{ {
MxU32 i; MxU32 i;
for (i = 0; i < _countof(g_characterData) - 1; i++) { for (i = 0; i < _countof(g_characterData); i++) {
if (!strcmpi(g_characterData[i].m_name, p_key)) { if (!strcmpi(g_characterData[i].m_name, p_key)) {
break; break;
} }
@ -448,13 +459,13 @@ void LegoCharacterManager::SetCustomizeAnimFile(const char* p_value)
} }
// STUB: LEGO1 0x10085210 // STUB: LEGO1 0x10085210
LegoROI* LegoCharacterManager::FUN_10085210(const LegoChar*, LegoChar*, undefined) LegoROI* LegoCharacterManager::FUN_10085210(const char*, char*, undefined)
{ {
return NULL; return NULL;
} }
// FUNCTION: LEGO1 0x10085a80 // FUNCTION: LEGO1 0x10085a80
LegoROI* LegoCharacterManager::FUN_10085a80(LegoChar* p_und1, LegoChar* p_und2, undefined p_und3) LegoROI* LegoCharacterManager::FUN_10085a80(char* p_und1, char* p_und2, undefined p_und3)
{ {
return FUN_10085210(p_und1, p_und2, p_und3); return FUN_10085210(p_und1, p_und2, p_und3);
} }

2
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View file

@ -115,7 +115,7 @@ LegoChar* LegoAnimPresenter::FUN_10069150(const LegoChar* p_und1)
{ {
LegoChar* str; LegoChar* str;
if (LegoCharacterManager::FUN_10084c00(p_und1 + 1)) { if (LegoCharacterManager::Exists(p_und1 + 1)) {
str = new LegoChar[strlen(p_und1)]; str = new LegoChar[strlen(p_und1)];
if (str != NULL) { if (str != NULL) {