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

Fix names

Browse Source
This commit is contained in:
Christian Semmler 2024-01-03 22:00:00 -05:00
parent 7c6af73418
commit d47585b4b8
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
LEGO1/mxdirect3d.cpp
View File

@ -272,15 +272,15 @@ MxDeviceEnumerate::MxDeviceEnumerate()
// FUNCTION: LEGO1 0x1009c070 // FUNCTION: LEGO1 0x1009c070
BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName) BOOL MxDeviceEnumerate::EnumDirectDrawCallback(LPGUID p_guid, LPSTR p_driverDesc, LPSTR p_driverName)
{ {
MxDriver device(p_guid, p_driverDesc, p_driverName); MxDriver driver(p_guid, p_driverDesc, p_driverName);
m_list.push_back(device); m_list.push_back(driver);
// Must be zeroed because held resources are copied by pointer only // Must be zeroed because held resources are copied by pointer only
// and should not be freed at the end of this function // and should not be freed at the end of this function
device.m_guid = NULL; driver.m_guid = NULL;
device.m_driverDesc = NULL; driver.m_driverDesc = NULL;
device.m_driverName = NULL; driver.m_driverName = NULL;
memset(&device.m_ddCaps, 0, sizeof(device.m_ddCaps)); memset(&driver.m_ddCaps, 0, sizeof(driver.m_ddCaps));
LPDIRECT3D2 lpDirect3d2 = NULL; LPDIRECT3D2 lpDirect3d2 = NULL;
LPDIRECTDRAW lpDD = NULL; LPDIRECTDRAW lpDD = NULL;
@ -469,9 +469,8 @@ MxS32 MxDeviceEnumerate::ProcessDeviceBytes(MxS32 p_deviceNum, GUID& p_guid)
return -1; return -1;
GUID4 compareGuid; GUID4 compareGuid;
MxDriver& deviceEnumerate = *it; MxDriver& driver = *it;
for (list<MxDevice>::iterator it2 = deviceEnumerate.m_devices.begin(); it2 != deviceEnumerate.m_devices.end(); for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end(); it2++) {
it2++) {
memcpy(&compareGuid, (*it2).m_guid, sizeof(GUID4)); memcpy(&compareGuid, (*it2).m_guid, sizeof(GUID4));
if (compareGuid.m_data1 == deviceGuid.m_data1 && compareGuid.m_data2 == deviceGuid.m_data2 && if (compareGuid.m_data1 == deviceGuid.m_data1 && compareGuid.m_data2 == deviceGuid.m_data2 &&
@ -566,22 +565,21 @@ MxResult MxDeviceEnumerate::FUN_1009d210()
return FAILURE; return FAILURE;
for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end();) { for (list<MxDriver>::iterator it = m_list.begin(); it != m_list.end();) {
MxDriver& deviceEnumerate = *it; MxDriver& driver = *it;
if (!FUN_1009d370(deviceEnumerate)) if (!FUN_1009d370(driver))
m_list.erase(it++); m_list.erase(it++);
else { else {
for (list<MxDevice>::iterator it2 = deviceEnumerate.m_devices.begin(); for (list<MxDevice>::iterator it2 = driver.m_devices.begin(); it2 != driver.m_devices.end();) {
it2 != deviceEnumerate.m_devices.end();) {
MxDevice& device = *it2; MxDevice& device = *it2;
if (!FUN_1009d3d0(device)) if (!FUN_1009d3d0(device))
deviceEnumerate.m_devices.erase(it2++); driver.m_devices.erase(it2++);
else else
it2++; it2++;
} }
if (deviceEnumerate.m_devices.empty()) if (driver.m_devices.empty())
m_list.erase(it++); m_list.erase(it++);
else else
it++; it++;