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

Match some names/values (#545)

Browse Source 
* Match some names/values

* Fix mingw warning as error
This commit is contained in:
Nathan M Gilbert
2024-02-09 18:40:52 -05:00
committed by GitHub
parent f1f4bd14c6
commit 84af3e2158
8 changed files with 233 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View File

@@ -62,7 +62,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
{
MxBool paletteCreated = FALSE;
MxDriver* driver = NULL;
MxDevice* device = NULL;
Direct3DDeviceInfo* device = NULL;
MxResult result = FAILURE;
MxDeviceEnumerate100d9cc8 deviceEnumerate;
@@ -137,11 +137,11 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
if (MxVideoManager::VTable0x28(
p_videoParam,
m_direct3d->GetDirectDraw(),
m_direct3d->GetDirect3D(),
m_direct3d->GetFrontBuffer(),
m_direct3d->GetBackBuffer(),
m_direct3d->GetClipper(),
m_direct3d->DirectDraw(),
m_direct3d->Direct3D(),
m_direct3d->FrontBuffer(),
m_direct3d->BackBuffer(),
m_direct3d->Clipper(),
p_frequencyMS,
p_createThread
) != SUCCESS) {
@@ -169,8 +169,8 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
createStruct.m_pPalette = m_videoParam.GetPalette()->CreateNativePalette();
createStruct.m_isFullScreen = FALSE;
createStruct.m_isWideViewAngle = m_videoParam.Flags().GetWideViewAngle();
createStruct.m_direct3d = m_direct3d->GetDirect3D();
createStruct.m_d3dDevice = m_direct3d->GetDirect3DDevice();
createStruct.m_direct3d = m_direct3d->Direct3D();
createStruct.m_d3dDevice = m_direct3d->Direct3DDevice();
if (!m_3dManager->Create(createStruct)) {
goto done;
@@ -501,7 +501,7 @@ MxResult LegoVideoManager::ConfigureD3DRM()
return FAILURE;
}
MxAssignedDevice* assignedDevice = m_direct3d->GetAssignedDevice();
MxAssignedDevice* assignedDevice = m_direct3d->AssignedDevice();
if (assignedDevice && assignedDevice->GetFlags() & MxAssignedDevice::c_hardwareMode) {
if (assignedDevice->GetDesc().dpcTriCaps.dwTextureFilterCaps & D3DPTFILTERCAPS_LINEAR) {