TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-24 04:26:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename functions in LegoWorldPresenter : FUN_10067360 to LoadWorldPart and FUN_100674b0 to LoadWorldModel. Update m_unk0x50 to m_maxObjectId. (#1460)

Browse Source
This commit is contained in:
Florian Kaiser 2025-05-09 21:23:02 +02:00 committed by GitHub
parent c59343c220
commit a3d773f629
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,10 +50,10 @@ public:
// LegoWorldPresenter::`scalar deleting destructor' // LegoWorldPresenter::`scalar deleting destructor'
private: private:
MxResult FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile); MxResult LoadWorldPart(ModelDbPart& p_part, FILE* p_wdbFile);
MxResult FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world); MxResult LoadWorldModel(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world);
undefined4 m_unk0x50; MxU32 m_nextObjectId;
}; };
#endif // LEGOWORLDPRESENTER_H #endif // LEGOWORLDPRESENTER_H

20
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@ -46,7 +46,7 @@ void LegoWorldPresenter::configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQ
// FUNCTION: LEGO1 0x100665c0 // FUNCTION: LEGO1 0x100665c0
LegoWorldPresenter::LegoWorldPresenter() LegoWorldPresenter::LegoWorldPresenter()
{ {
m_unk0x50 = 50000; m_nextObjectId = 50000;
} }
// FUNCTION: LEGO1 0x10066770 // FUNCTION: LEGO1 0x10066770
@ -261,7 +261,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
while (cursor.Next(part)) { while (cursor.Next(part)) {
if (GetViewLODListManager()->Lookup(part->m_roiName.GetData()) == NULL && if (GetViewLODListManager()->Lookup(part->m_roiName.GetData()) == NULL &&
FUN_10067360(*part, wdbFile) != SUCCESS) { LoadWorldPart(*part, wdbFile) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -287,15 +287,15 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
} }
else if (g_legoWorldPresenterQuality <= 1 && !strnicmp(worlds[i].m_models[j].m_modelName, "haus", 4)) { else if (g_legoWorldPresenterQuality <= 1 && !strnicmp(worlds[i].m_models[j].m_modelName, "haus", 4)) {
if (worlds[i].m_models[j].m_modelName[4] == '3') { if (worlds[i].m_models[j].m_modelName[4] == '3') {
if (FUN_100674b0(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
if (FUN_100674b0(worlds[i].m_models[j - 2], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j - 2], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
if (FUN_100674b0(worlds[i].m_models[j - 1], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j - 1], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -303,7 +303,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
continue; continue;
} }
if (FUN_100674b0(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) { if (LoadWorldModel(worlds[i].m_models[j], wdbFile, p_world) != SUCCESS) {
return FAILURE; return FAILURE;
} }
} }
@ -314,7 +314,7 @@ MxResult LegoWorldPresenter::LoadWorld(char* p_worldName, LegoWorld* p_world)
} }
// FUNCTION: LEGO1 0x10067360 // FUNCTION: LEGO1 0x10067360
MxResult LegoWorldPresenter::FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile) MxResult LegoWorldPresenter::LoadWorldPart(ModelDbPart& p_part, FILE* p_wdbFile)
{ {
MxResult result; MxResult result;
MxU8* buff = new MxU8[p_part.m_partDataLength]; MxU8* buff = new MxU8[p_part.m_partDataLength];
@ -340,7 +340,7 @@ MxResult LegoWorldPresenter::FUN_10067360(ModelDbPart& p_part, FILE* p_wdbFile)
} }
// FUNCTION: LEGO1 0x100674b0 // FUNCTION: LEGO1 0x100674b0
MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world) MxResult LegoWorldPresenter::LoadWorldModel(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world)
{ {
MxU8* buff = new MxU8[p_model.m_modelDataLength]; MxU8* buff = new MxU8[p_model.m_modelDataLength];
@ -359,8 +359,8 @@ MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, FILE* p_wdbFile
action.SetDirection(p_model.m_direction); action.SetDirection(p_model.m_direction);
action.SetUp(p_model.m_up); action.SetUp(p_model.m_up);
MxU32 objectId = m_unk0x50; MxU32 objectId = m_nextObjectId;
m_unk0x50++; m_nextObjectId++;
action.SetObjectId(objectId); action.SetObjectId(objectId);
action.SetAtomId(atom); action.SetAtomId(atom);