isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-11 10:41:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix name collision for Ghidra

Browse Source
This commit is contained in:
jonschz 2026-01-02 13:39:56 +01:00
parent a866c44527
commit e4cff164b8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/lego/sources/roi/legolod.cpp
View File

@ -20,9 +20,9 @@ LPDIRECT3DRMMATERIAL g_unk0x101013d4 = NULL;
const char* g_InhPrefix = "inh"; const char* g_InhPrefix = "inh";
#ifdef BETA10 #ifdef BETA10
inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer); inline BOOL GetD3DRM_legolod(IDirect3DRM2*& d3drm, Tgl::Renderer* pRenderer);
#else #else
inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer); inline IDirect3DRM2* GetD3DRM_legolod(Tgl::Renderer* pRenderer);
#endif #endif
inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mesh* pMesh); 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 #ifdef BETA10
IDirect3DRM2* d3drm = NULL; IDirect3DRM2* d3drm = NULL;
assert((p_renderer != NULL)); assert((p_renderer != NULL));
GetD3DRM(d3drm, p_renderer); GetD3DRM_legolod(d3drm, p_renderer);
if (d3drm->CreateMaterial(10.0, &g_unk0x101013d4)) { if (d3drm->CreateMaterial(10.0, &g_unk0x101013d4)) {
assert(0); assert(0);
} }
#else #else
GetD3DRM(p_renderer)->CreateMaterial(10.0, &g_unk0x101013d4); GetD3DRM_legolod(p_renderer)->CreateMaterial(10.0, &g_unk0x101013d4);
#endif #endif
} }
@ -424,7 +424,7 @@ inline BOOL GetMeshData(IDirect3DRMMesh*& mesh, D3DRMGROUPINDEX& index, Tgl::Mes
#ifdef BETA10 #ifdef BETA10
// FUNCTION: BETA10 0x1018cfc5 // 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() // Note: Code duplication with viewmanager.cpp:GetD3DRM()
assert(p_tglRenderer); assert(p_tglRenderer);
@ -434,7 +434,7 @@ inline BOOL GetD3DRM(IDirect3DRM2*& d3drm, Tgl::Renderer* p_tglRenderer)
return 0; return 0;
} }
#else #else
inline IDirect3DRM2* GetD3DRM(Tgl::Renderer* pRenderer) inline IDirect3DRM2* GetD3DRM_legolod(Tgl::Renderer* pRenderer)
{ {
return ((TglImpl::RendererImpl*) pRenderer)->ImplementationData(); return ((TglImpl::RendererImpl*) pRenderer)->ImplementationData();
} }

6
LEGO1/viewmanager/viewmanager.cpp
View File

@ -35,7 +35,7 @@ float g_viewDistance = 0.000125F;
float g_elapsedSeconds = 0; float g_elapsedSeconds = 0;
inline void SetAppData(ViewROI* p_roi, LPD3DRM_APPDATA data); 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); inline undefined4 GetFrame(IDirect3DRMFrame2** frame, Tgl::Group* scene);
// STUB: BETA10 0x1017202e // STUB: BETA10 0x1017202e
@ -64,7 +64,7 @@ ViewManager::ViewManager(Tgl::Renderer* pRenderer, Tgl::Group* scene, const Orie
{ {
SetPOVSource(point_of_view); SetPOVSource(point_of_view);
prev_render_time = 0.09; prev_render_time = 0.09;
GetD3DRM(d3drm, pRenderer); GetD3DRM_viewmanager(d3drm, pRenderer);
GetFrame(&frame, scene); GetFrame(&frame, scene);
#ifdef BETA10 #ifdef BETA10
@ -601,7 +601,7 @@ inline void SetAppData(ViewROI* p_roi, LPD3DRM_APPDATA data)
} }
// FUNCTION: BETA10 0x10171f30 // 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); assert(p_tglRenderer);
TglImpl::RendererImpl* renderer = (TglImpl::RendererImpl*) p_tglRenderer; TglImpl::RendererImpl* renderer = (TglImpl::RendererImpl*) p_tglRenderer;