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

style fixes

Browse Source
This commit is contained in:
Anonymous Maarten 2024-02-06 22:20:14 +01:00
parent 55af10f69e
commit 4b68b6ffcf
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -63,7 +63,7 @@ message(STATUS "MSVC for decompilation: ${MSVC_FOR_DECOMP}")
option(ISLE_WERROR "Treat warnings as errors" OFF) option(ISLE_WERROR "Treat warnings as errors" OFF)
option(ISLE_BUILD_APP "Build ISLE.EXE application" ON) option(ISLE_BUILD_APP "Build ISLE.EXE application" ON)
cmake_dependent_option(ISLE_BUILD_CONFIG "Build ISLE.EXE application" ON "NOT MINGW" OFF) cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "NOT MINGW" OFF)
option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP}) option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP})
option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON) option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON)
cmake_dependent_option(ISLE_USE_DX5_LIBS "Build with internal DirectX 5 SDK Libraries" ON ISLE_USE_DX5 OFF) cmake_dependent_option(ISLE_USE_DX5_LIBS "Build with internal DirectX 5 SDK Libraries" ON ISLE_USE_DX5 OFF)

4
CONFIG/AboutDlg.cpp
View File

@ -12,13 +12,13 @@ CAboutDialog::CAboutDialog() : CDialog(IDD)
// FUNCTION: CONFIG 0x00403c90 // FUNCTION: CONFIG 0x00403c90
void CAboutDialog::BeginModalState() void CAboutDialog::BeginModalState()
{ {
::EnableWindow(this->m_hWnd, FALSE); ::EnableWindow(m_hWnd, FALSE);
} }
// FUNCTION: CONFIG 0x00403ca0 // FUNCTION: CONFIG 0x00403ca0
void CAboutDialog::EndModalState() void CAboutDialog::EndModalState()
{ {
::EnableWindow(this->m_hWnd, TRUE); ::EnableWindow(m_hWnd, TRUE);
} }
// FUNCTION: CONFIG 0x00403d20 // FUNCTION: CONFIG 0x00403d20

2
CONFIG/config.cpp
View File

@ -52,7 +52,7 @@ BOOL CConfigApp::InitInstance()
CConfigCommandLineInfo cmdInfo; CConfigCommandLineInfo cmdInfo;
ParseCommandLine(cmdInfo); ParseCommandLine(cmdInfo);
if (_stricmp(afxCurrentAppName, "config") == 0) { if (_stricmp(afxCurrentAppName, "config") == 0) {
currentConfigApp->m_run_config_dialog = TRUE; m_run_config_dialog = TRUE;
} }
m_device_enumerator = new MxDeviceEnumerate; m_device_enumerator = new MxDeviceEnumerate;
if (m_device_enumerator->DoEnumerate()) { if (m_device_enumerator->DoEnumerate()) {

15
LEGO1/mxdirectx/mxdirect3d.cpp
View File

@ -945,10 +945,10 @@ int MxDeviceEnumerate::FormatDeviceName(char* p_buffer, const MxDriver* p_driver
p_buffer, p_buffer,
"%d 0x%x 0x%x 0x%x 0x%x", "%d 0x%x 0x%x 0x%x 0x%x",
number, number,
p_device->m_guid->Data1, ((DWORD*)(p_device->m_guid))[0],
*(DWORD*) &p_device->m_guid->Data2, ((DWORD*)(p_device->m_guid))[1],
*(DWORD*) &p_device->m_guid->Data4[0], ((DWORD*)(p_device->m_guid))[2],
*(DWORD*) &p_device->m_guid->Data4[4] ((DWORD*)(p_device->m_guid))[3]
); );
return 0; return 0;
} }
@ -1001,8 +1001,10 @@ int MxDeviceEnumerate::FUN_1009d0d0()
// FUNCTION: LEGO1 0x1009d1a0 // FUNCTION: LEGO1 0x1009d1a0
int MxDeviceEnumerate::SupportsMMX() int MxDeviceEnumerate::SupportsMMX()
{ {
int supports_mmx = SupportsCPUID(); if (!SupportsCPUID()) {
if (supports_mmx) { return 0;
}
int supports_mmx;
#ifdef _MSC_VER #ifdef _MSC_VER
__asm { __asm {
mov eax, 0x0 ; EAX=0: Highest Function Parameter and Manufacturer ID mov eax, 0x0 ; EAX=0: Highest Function Parameter and Manufacturer ID
@ -1035,7 +1037,6 @@ int MxDeviceEnumerate::SupportsMMX()
: "=a"(supports_mmx) // supports_mmx == EAX : "=a"(supports_mmx) // supports_mmx == EAX
); );
#endif #endif
}
return supports_mmx; return supports_mmx;
} }