mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some library globals (#1692)

Browse Source 
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2025-10-09 22:28:38 +02:00
committed by GitHub
parent 9531678dfd
commit e355b55907
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/library_msvc.h
View File

@@ -937,8 +937,22 @@
// GLOBAL: LEGO1 0x100db6e0 // GLOBAL: LEGO1 0x100db6e0
// GUID_SysKeyboard // GUID_SysKeyboard
// Cannot be handled right now due to anonymous pointer in struct // GLOBAL: LEGO1 0x100dd1c0
// IID_IDirect3DRM2
// Cannot be handled right now due to anonymous pointer in struct.
// We can annotate it on the original side, but we have no symbol on the recomp side.
// We would need a way of annotating "the pointer at c_dfDIKeyboard+0x14 has orig address 0x10097f80".
// // GLOBAL: LEGO1 0x10098f80 // // GLOBAL: LEGO1 0x10098f80
// c_dfDIKeyboard // c_dfDIKeyboard
/// Globals from libraries without symbols
// STRING: LEGO1 0x100dabb0
static const char* ___crtLCMapStringA_str = "\0";
// STRING: LEGO1 0x100dabb4
static const wchar_t *___crtLCMapStringA_wstr = L"\0";
#endif #endif

2
LEGO1/omni/src/audio/mxsoundmanager.cpp
View File

@@ -11,7 +11,7 @@
DECOMP_SIZE_ASSERT(MxSoundManager, 0x3c); DECOMP_SIZE_ASSERT(MxSoundManager, 0x3c);
// GLOBAL LEGO1 0x10101420 // GLOBAL: LEGO1 0x10101420
MxS32 g_volumeAttenuation[100] = {-6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058, MxS32 g_volumeAttenuation[100] = {-6643, -5643, -5058, -4643, -4321, -4058, -3836, -3643, -3473, -3321, -3184, -3058,
-2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058, -2943, -2836, -2736, -2643, -2556, -2473, -2395, -2321, -2251, -2184, -2120, -2058,
-2000, -1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473, -2000, -1943, -1888, -1836, -1785, -1736, -1689, -1643, -1599, -1556, -1514, -1473,

7
LEGO1/tgl/d3drm/renderer.cpp
View File

@@ -88,8 +88,7 @@ inline Result RendererCreateDevice(
if (Succeeded(result)) { if (Succeeded(result)) {
if (rCreateData.m_pBackBuffer) { if (rCreateData.m_pBackBuffer) {
// LEGO1 0x10101040 // annotated below
// GLOBAL: BETA10 0x102055f4
static int g_setBufferCount = 1; static int g_setBufferCount = 1;
if (g_setBufferCount) { if (g_setBufferCount) {
Result result2 = ResultVal(rpDevice->SetBufferCount(2)); Result result2 = ResultVal(rpDevice->SetBufferCount(2));
@@ -101,6 +100,10 @@ inline Result RendererCreateDevice(
return result; return result;
} }
// GLOBAL: LEGO1 0x10101040
// GLOBAL: BETA10 0x102055f4
// ?g_setBufferCount@?3??RendererCreateDevice@@YA?AW4Result@Tgl@@PAUIDirect3DRM2@@ABUDeviceDirectDrawCreateData@3@AAPAUIDirect3DRMDevice2@@@Z@4HA
// FUNCTION: BETA10 0x1016cf40 // FUNCTION: BETA10 0x1016cf40
inline Result RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& rCreateData, DeviceImpl& rDevice) inline Result RendererImpl::CreateDevice(const DeviceDirectDrawCreateData& rCreateData, DeviceImpl& rDevice)
{ {