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

Remove COMPAT_CONST in MxVideoParam::MxVideoParam

Browse Source
This commit is contained in:
Anonymous Maarten 2024-01-25 00:58:52 +01:00
parent 904413b7ea
commit f5540b02c3
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ISLE/isleapp.cpp
View File

@ -52,7 +52,15 @@ IsleApp::IsleApp()
m_frameDelta = 10; m_frameDelta = 10;
m_windowActive = 1; m_windowActive = 1;
m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags()); #ifdef COMPAT_MODE
{
MxRect32 r(0, 0, 639, 479);
MxVideoParamFlags flags;
m_videoParam = MxVideoParam(r, NULL, 1, flags);
}
#else
m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags());
#endif
m_videoParam.Flags().Set16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16); m_videoParam.Flags().Set16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16);
m_windowHandle = NULL; m_windowHandle = NULL;

2
LEGO1/LEGO1.mingw.def
View File

@ -67,10 +67,8 @@ EXPORTS
_ZN12MxDirectDraw18GetPrimaryBitDepthEv _ZN12MxDirectDraw18GetPrimaryBitDepthEv
_ZN12MxDirectDraw5PauseEi@4 = _ZN12MxDirectDraw5PauseEi _ZN12MxDirectDraw5PauseEi@4 = _ZN12MxDirectDraw5PauseEi
_ZN12MxVideoParam13SetDeviceNameEPc@4 = _ZN12MxVideoParam13SetDeviceNameEPc _ZN12MxVideoParam13SetDeviceNameEPc@4 = _ZN12MxVideoParam13SetDeviceNameEPc
_ZN12MxVideoParamC1ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags@16 = _ZN12MxVideoParamC1ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags
_ZN12MxVideoParamC1ERS_@4 = _ZN12MxVideoParamC1ERS_ _ZN12MxVideoParamC1ERS_@4 = _ZN12MxVideoParamC1ERS_
_ZN12MxVideoParamC1Ev _ZN12MxVideoParamC1Ev
_ZN12MxVideoParamC2ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags@16 = _ZN12MxVideoParamC2ERK8MxRect32P9MxPalettejRK17MxVideoParamFlags
_ZN12MxVideoParamC2ERS_@4 = _ZN12MxVideoParamC2ERS_ _ZN12MxVideoParamC2ERS_@4 = _ZN12MxVideoParamC2ERS_
_ZN12MxVideoParamC2Ev _ZN12MxVideoParamC2Ev
_ZN12MxVideoParamD1Ev _ZN12MxVideoParamD1Ev

4
LEGO1/omni/include/mxvideoparam.h
View File

@ -16,10 +16,10 @@ class MxVideoParam {
__declspec(dllexport) MxVideoParam(); __declspec(dllexport) MxVideoParam();
__declspec(dllexport) MxVideoParam(MxVideoParam& p_videoParam); __declspec(dllexport) MxVideoParam(MxVideoParam& p_videoParam);
__declspec(dllexport) MxVideoParam( __declspec(dllexport) MxVideoParam(
COMPAT_CONST MxRect32& p_rect, MxRect32& p_rect,
MxPalette* p_palette, MxPalette* p_palette,
MxULong p_backBuffers, MxULong p_backBuffers,
COMPAT_CONST MxVideoParamFlags& p_flags MxVideoParamFlags& p_flags
); );
__declspec(dllexport) MxVideoParam& operator=(const MxVideoParam& p_videoParam); __declspec(dllexport) MxVideoParam& operator=(const MxVideoParam& p_videoParam);
__declspec(dllexport) ~MxVideoParam(); __declspec(dllexport) ~MxVideoParam();

4
LEGO1/omni/src/video/mxvideoparam.cpp
View File

@ -22,10 +22,10 @@ MxVideoParam::MxVideoParam()
// FUNCTION: LEGO1 0x100beca0 // FUNCTION: LEGO1 0x100beca0
MxVideoParam::MxVideoParam( MxVideoParam::MxVideoParam(
COMPAT_CONST MxRect32& p_rect, MxRect32& p_rect,
MxPalette* p_palette, MxPalette* p_palette,
MxULong p_backBuffers, MxULong p_backBuffers,
COMPAT_CONST MxVideoParamFlags& p_flags MxVideoParamFlags& p_flags
) )
{ {
this->m_rect = p_rect; this->m_rect = p_rect;