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

Match format function better, add dead code function

Browse Source
This commit is contained in:
disinvite 2024-06-26 22:33:26 -04:00
parent 3ed1e8606c
commit d6fc9026ed
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
LEGO1/mxdirectx/mxdirectxinfo.cpp
View File

@ -679,21 +679,44 @@ int MxDeviceEnumerate::FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo
int number = 0; int number = 0;
assert(p_ddInfo && p_d3dInfo); assert(p_ddInfo && p_d3dInfo);
for (list<MxDriver>::const_iterator it = m_list.begin(); it != m_list.end(); it++) { for (list<MxDriver>::const_iterator it = m_list.begin(); it != m_list.end(); it++, number++) {
if (&(*it) == p_ddInfo) { if (&(*it) == p_ddInfo) {
sprintf( GUID4 guid;
p_buffer, memcpy(&guid, p_d3dInfo->m_guid, sizeof(GUID4));
"%d 0x%x 0x%x 0x%x 0x%x",
number, sprintf(p_buffer, "%d 0x%x 0x%x 0x%x 0x%x", number, guid.m_data1, guid.m_data2, guid.m_data3, guid.m_data4);
((DWORD*) (p_d3dInfo->m_guid))[0],
((DWORD*) (p_d3dInfo->m_guid))[1],
((DWORD*) (p_d3dInfo->m_guid))[2],
((DWORD*) (p_d3dInfo->m_guid))[3]
);
return 0; return 0;
} }
number++;
} }
return -1;
}
// FUNCTION: BETA10 0x1011cc65
int MxDeviceEnumerate::BETA_1011cc65(int p_idx, char* p_buffer)
{
if (p_idx < 0 || !IsInitialized()) {
return -1;
}
int i = 0;
int j = 0;
for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end(); it++, i++) {
MxDriver& driver = *it;
for (list<Direct3DDeviceInfo>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
if (j == p_idx) {
GUID4 guid;
memcpy(&guid, &((Direct3DDeviceInfo&) *it2).m_guid, sizeof(GUID4));
sprintf(p_buffer, "%d 0x%x 0x%x 0x%x 0x%x", i, guid.m_data1, guid.m_data2, guid.m_data3, guid.m_data4);
return 0;
}
j++;
}
}
return -1; return -1;
} }

5
LEGO1/mxdirectx/mxdirectxinfo.h
View File

@ -159,10 +159,10 @@ struct MxDriver {
// TEMPLATE: BETA10 0x1011f6f0 // TEMPLATE: BETA10 0x1011f6f0
// List<MxDriver>::~List<MxDriver> // List<MxDriver>::~List<MxDriver>
// Compiler-generated copy ctor // Compiler-generated copy ctor for MxDriver
// SYNTHETIC: CONFIG 0x401990 // SYNTHETIC: CONFIG 0x401990
// SYNTHETIC: LEGO1 0x1009c290 // SYNTHETIC: LEGO1 0x1009c290
// MxDriver::MxDriver // ??0MxDriver@@QAE@ABU0@@Z
// TEMPLATE: CONFIG 0x401b00 // TEMPLATE: CONFIG 0x401b00
// TEMPLATE: LEGO1 0x1009c400 // TEMPLATE: LEGO1 0x1009c400
@ -207,6 +207,7 @@ class MxDeviceEnumerate {
int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid); int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid);
int GetDevice(int p_deviceNum, MxDriver*& p_driver, Direct3DDeviceInfo*& p_device); int GetDevice(int p_deviceNum, MxDriver*& p_driver, Direct3DDeviceInfo*& p_device);
int FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo) const; int FormatDeviceName(char* p_buffer, const MxDriver* p_ddInfo, const Direct3DDeviceInfo* p_d3dInfo) const;
int BETA_1011cc65(int p_idx, char* p_buffer);
int FUN_1009d0d0(); int FUN_1009d0d0();
int FUN_1009d210(); int FUN_1009d210();