From e4cff164b8fd5ee927947ae89bd8112f95ec3f01 Mon Sep 17 00:00:00 2001 From: jonschz Date: Fri, 2 Jan 2026 13:39:56 +0100 Subject: [PATCH] Fix name collision for Ghidra --- LEGO1/lego/sources/roi/legolod.cpp | 12 ++++++------ LEGO1/viewmanager/viewmanager.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LEGO1/lego/sources/roi/legolod.cpp b/LEGO1/lego/sources/roi/legolod.cpp index 8fa16204..e1f9e172 100644 --- a/LEGO1/lego/sources/roi/legolod.cpp +++ b/LEGO1/lego/sources/roi/legolod.cpp @@ -20,9 +20,9 @@ LPDIRECT3DRMMATERIAL g_unk0x101013d4 = NULL; const char* g_InhPrefix = "inh"; #ifdef BETA10 -inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); +inline BOOL GetD3DRM_legolod(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); #else -inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer); +inline IDirect3DRM2* GetD3DRM_legolod(Tgl::Renderer* pRenderer); #endif inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mesh* pMesh); @@ -34,12 +34,12 @@ LegoLOD::LegoLOD(Tgl::Renderer* p_renderer) : ViewLOD(p_renderer) #ifdef BETA10 IDirect3DRM2* d3drm = NULL; assert((p_renderer != NULL)); - GetD3DRM(d3drm, p_renderer); + GetD3DRM_legolod(d3drm, p_renderer); if (d3drm->CreateMaterial(10.0, &g_unk0x101013d4)) { assert(0); } #else - GetD3DRM(p_renderer)->CreateMaterial(10.0, &g_unk0x101013d4); + GetD3DRM_legolod(p_renderer)->CreateMaterial(10.0, &g_unk0x101013d4); #endif } @@ -424,7 +424,7 @@ inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mes #ifdef BETA10 // FUNCTION: BETA10 0x1018cfc5 -inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) +inline BOOL GetD3DRM_legolod(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) { // Note: Code duplication with viewmanager.cpp:GetD3DRM() assert(p_tglRenderer); @@ -434,7 +434,7 @@ inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) return 0; } #else -inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer) +inline IDirect3DRM2* GetD3DRM_legolod(Tgl::Renderer* pRenderer) { return ((TglImpl::RendererImpl*) pRenderer)->ImplementationData(); } diff --git a/LEGO1/viewmanager/viewmanager.cpp b/LEGO1/viewmanager/viewmanager.cpp index 9bf1db44..fb48c623 100644 --- a/LEGO1/viewmanager/viewmanager.cpp +++ b/LEGO1/viewmanager/viewmanager.cpp @@ -35,7 +35,7 @@ float g_viewDistance = 0.000125F; float g_elapsedSeconds = 0; inline void SetAppData(ViewROI* p_roi, LPD3DRM_APPDATA data); -inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); +inline undefined4 GetD3DRM_viewmanager(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); inline undefined4 GetFrame(IDirect3DRMFrame2** frame, Tgl::Group* scene); // STUB: BETA10 0x1017202e @@ -64,7 +64,7 @@ ViewManager::ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const Orie { SetPOVSource(point_of_view); prev_render_time = 0.09; - GetD3DRM(d3drm, pRenderer); + GetD3DRM_viewmanager(d3drm, pRenderer); GetFrame(&frame, scene); #ifdef BETA10 @@ -601,7 +601,7 @@ inline void SetAppData(ViewROI* p_roi, LPD3DRM_APPDATA data) } // FUNCTION: BETA10 0x10171f30 -inline undefined4 GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) +inline undefined4 GetD3DRM_viewmanager(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer) { assert(p_tglRenderer); TglImpl::RendererImpl* renderer = (TglImpl::RendererImpl*) p_tglRenderer;