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

Fix bad merge

Browse Source
This commit is contained in:
Christian Semmler 2025-05-11 08:36:01 -07:00
parent d9dac02db5
commit f4ba9301d5
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,11 +340,7 @@ MxResult LegoWorldPresenter::LoadWorldPart(ModelDbPart& p_part, SDL_IOStream* p_
} }
// FUNCTION: LEGO1 0x100674b0 // FUNCTION: LEGO1 0x100674b0
<<<<<<< HEAD MxResult LegoWorldPresenter::LoadWorldModel(ModelDbModel& p_model, SDL_IOStream* p_wdbFile, LegoWorld* p_world)
MxResult LegoWorldPresenter::FUN_100674b0(ModelDbModel& p_model, SDL_IOStream* p_wdbFile, LegoWorld* p_world)
=======
MxResult LegoWorldPresenter::LoadWorldModel(ModelDbModel& p_model, FILE* p_wdbFile, LegoWorld* p_world)
>>>>>>> isle/master
{ {
MxU8* buff = new MxU8[p_model.m_modelDataLength]; MxU8* buff = new MxU8[p_model.m_modelDataLength];