From f4ba9301d56c61614bc2a2753061baf89bee9d81 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 11 May 2025 08:36:01 -0700 Subject: [PATCH] Fix bad merge --- LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp index 97c8b983..62fa7c00 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp @@ -340,11 +340,7 @@ MxResult LegoWorldPresenter::LoadWorldPart(ModelDbPart& p_part, SDL_IOStream* p_ } // FUNCTION: LEGO1 0x100674b0 -<<<<<<< HEAD -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 +MxResult LegoWorldPresenter::LoadWorldModel(ModelDbModel& p_model, SDL_IOStream* p_wdbFile, LegoWorld* p_world) { MxU8* buff = new MxU8[p_model.m_modelDataLength];