Skip to content

Commit

Permalink
Update SetClipStatus() flags
Browse files Browse the repository at this point in the history
  • Loading branch information
elishacloud committed Apr 25, 2024
1 parent 6651807 commit c383c82
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dllmain/BuildNo.rc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define BUILD_NUMBER 7004
#define BUILD_NUMBER 7005
4 changes: 2 additions & 2 deletions ddraw/IDirect3DDeviceX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3789,14 +3789,15 @@ HRESULT m_IDirect3DDeviceX::SetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus)
}

// D3DCLIPSTATUS_EXTENTS3 is Not currently implemented in DirectDraw.
if (!(lpD3DClipStatus->dwFlags & D3DCLIPSTATUS_STATUS))
if (lpD3DClipStatus->dwFlags & D3DCLIPSTATUS_EXTENTS3)
{
LOG_LIMIT(100, __FUNCTION__ << " Error: only clip status flag is supported. Using unsupported dwFlags combination: " << Logging::hex(lpD3DClipStatus->dwFlags));
return DDERR_UNSUPPORTED;
}
else if (lpD3DClipStatus->dwFlags & D3DCLIPSTATUS_EXTENTS2)
{
LOG_LIMIT(100, __FUNCTION__ << " Warning: Extents 2D flag Not Implemented: " << *lpD3DClipStatus);
D3DClipStatus = *lpD3DClipStatus;
}

// For now just save clip status
Expand Down Expand Up @@ -3925,7 +3926,6 @@ HRESULT m_IDirect3DDeviceX::GetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus)
}

// ToDo: get clip status from Direct3D9

*lpD3DClipStatus = D3DClipStatus;

return D3D_OK;
Expand Down

0 comments on commit c383c82

Please sign in to comment.