isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-12-03 21:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use bitfield for MxVideoParamFlags (#40)

Browse source 
* Use bitfield for MxVideoParamFlags

Using a bitfield for MxVideoParamFlags results in the same xor/and logic that was partially inlined in the header file. This approach is a lot cleaner and there's a good chance this is what the devs would have landed on.

The code generation is really finicky -- other inlines in the header influence the code just by being there -- so I decided to stub out all of them. This got the match to 100%.

While I was in isle.cpp::SetupVideoFlags, I changed the signature so that the `m_using16bit` parameter is just `using16bit`.

* fix: cast Set16Bit inline arg to byte
This commit is contained in:
MS 2023-06-23 02:00:51 -04:00 committed by GitHub
parent bd245dc6d8
commit 4f4863af6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ISLE/isle.cpp
View file

@ -36,7 +36,7 @@ Isle::Isle()
m_windowActive = 1; m_windowActive = 1;
m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags()); m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags());
m_videoParam.flags().Enable16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16); m_videoParam.flags().Set16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16);
m_windowHandle = NULL; m_windowHandle = NULL;
m_cursorArrow = NULL; m_cursorArrow = NULL;
@ -228,22 +228,22 @@ void Isle::LoadConfig()
// OFFSET: ISLE 0x401560 // OFFSET: ISLE 0x401560
void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers, void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
BOOL using8bit, BOOL m_using16bit, BOOL param_6, BOOL param_7, BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
BOOL wideViewAngle, char *deviceId) BOOL wideViewAngle, char *deviceId)
{ {
m_videoParam.flags().EnableFullScreen(fullScreen); m_videoParam.flags().SetFullScreen(fullScreen);
m_videoParam.flags().EnableFlipSurfaces(flipSurfaces); m_videoParam.flags().SetFlipSurfaces(flipSurfaces);
m_videoParam.flags().EnableBackBuffers(backBuffers); m_videoParam.flags().SetBackBuffers(!backBuffers);
m_videoParam.flags().EnableUnknown1(param_6); m_videoParam.flags().Set_f2bit0(!param_6);
m_videoParam.flags().SetUnknown3(param_7); m_videoParam.flags().Set_f1bit7(param_7);
m_videoParam.flags().EnableWideViewAngle(wideViewAngle); m_videoParam.flags().SetWideViewAngle(wideViewAngle);
m_videoParam.flags().EnableUnknown2(); m_videoParam.flags().Set_f2bit1(1);
m_videoParam.SetDeviceName(deviceId); m_videoParam.SetDeviceName(deviceId);
if (using8bit) { if (using8bit) {
m_videoParam.flags().Set8Bit(); m_videoParam.flags().Set16Bit(0);
} }
if (m_using16bit) { if (using16bit) {
m_videoParam.flags().Set16Bit(); m_videoParam.flags().Set16Bit(1);
} }
} }

2
ISLE/isle.h
View file

@ -27,7 +27,7 @@ class Isle
BOOL SetupLegoOmni(); BOOL SetupLegoOmni();
void LoadConfig(); void LoadConfig();
void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers, void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
BOOL using8bit, BOOL m_using16bit, BOOL param_6, BOOL param_7, BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
BOOL wideViewAngle, char *deviceId); BOOL wideViewAngle, char *deviceId);
void SetupCursor(WPARAM wParam); void SetupCursor(WPARAM wParam);

20
LEGO1/mxvideoparamflags.cpp
View file

@ -3,15 +3,13 @@
// OFFSET: LEGO1 0x100bec40 // OFFSET: LEGO1 0x100bec40
MxVideoParamFlags::MxVideoParamFlags() MxVideoParamFlags::MxVideoParamFlags()
{ {
// TODO: convert to EnableXXX function calls this->SetFullScreen(0);
unsigned char bVar1 = this->m_flags1; this->SetFlipSurfaces(0);
this->m_flags1 = bVar1 & 0xfe; this->SetBackBuffers(0);
this->m_flags1 = bVar1 & 0xfc; this->Set_f1bit3(0);
this->m_flags1 = bVar1 & 0xf8; this->Set_f1bit4(0);
this->m_flags1 = bVar1 & 0xf0; this->Set16Bit(0);
this->m_flags1 = bVar1 & 0xe0; this->SetWideViewAngle(1);
this->m_flags2 = this->m_flags2 | 2; this->Set_f1bit7(1);
this->m_flags1 = bVar1 & 0xc0; this->Set_f2bit1(1);
this->m_flags1 = bVar1 & 0xc0 | 0x40;
this->m_flags1 = 0xc0;
} }

137
LEGO1/mxvideoparamflags.h
View file

@ -1,88 +1,49 @@
#ifndef MXVIDEOPARAMFLAGS_H #ifndef MXVIDEOPARAMFLAGS_H
#define MXVIDEOPARAMFLAGS_H #define MXVIDEOPARAMFLAGS_H
#include "legoinc.h" #include "legoinc.h"
class MxVideoParamFlags // Must be union with struct for match.
{ typedef union {
public: struct {
enum LowFlags BYTE bit0: 1;
{ BYTE bit1: 1;
FULL_SCREEN = 0x1, BYTE bit2: 1;
FLIP_SURFACES = 0x2, BYTE bit3: 1;
BACK_BUFFERS = 0x4, BYTE bit4: 1;
ENABLE_16BIT = 0x20, BYTE bit5: 1;
WIDE_VIEW_ANGLE = 0x40, BYTE bit6: 1;
UNKNOWN3 = 0x80 BYTE bit7: 1;
}; };
// BYTE all; // ?
enum HighFlags } flag_bitfield;
{
UNKNOWN1 = 0x1, class MxVideoParamFlags
UNKNOWN2 = 0x2 {
}; public:
__declspec(dllexport) MxVideoParamFlags();
__declspec(dllexport) MxVideoParamFlags();
inline void SetFullScreen(BOOL e) { m_flags1.bit0 = e; }
inline void EnableFullScreen(BOOL e) inline void SetFlipSurfaces(BOOL e) { m_flags1.bit1 = e; }
{ inline void SetBackBuffers(BOOL e) { m_flags1.bit2 = e; }
m_flags1 = (m_flags1 ^ (e << 0)) & FULL_SCREEN ^ m_flags1; inline void Set_f1bit3(BOOL e) { m_flags1.bit3 = e; }
} inline void Set_f1bit4(BOOL e) { m_flags1.bit4 = e; }
inline void Set16Bit(BYTE e) { m_flags1.bit5 = e; }
inline void EnableFlipSurfaces(BOOL e) inline void SetWideViewAngle(BOOL e) { m_flags1.bit6 = e; }
{ inline void Set_f1bit7(BOOL e) { m_flags1.bit7 = e; }
m_flags1 = (m_flags1 ^ (e << 1)) & FLIP_SURFACES ^ m_flags1; inline void Set_f2bit0(BOOL e) { m_flags2.bit0 = e; }
} inline void Set_f2bit1(BOOL e) { m_flags2.bit1 = e; }
inline void Set_f2bit2(BOOL e) { m_flags2.bit2 = e; }
inline void EnableBackBuffers(BOOL e) inline void Set_f2bit3(BOOL e) { m_flags2.bit3 = e; }
{ inline void Set_f2bit4(BOOL e) { m_flags2.bit4 = e; }
m_flags1 = (m_flags1 ^ ((!e) << 2)) & BACK_BUFFERS ^ m_flags1; inline void Set_f2bit5(BOOL e) { m_flags2.bit5 = e; }
} inline void Set_f2bit6(BOOL e) { m_flags2.bit6 = e; }
inline void Set_f2bit7(BOOL e) { m_flags2.bit7 = e; }
inline void SetUnknown3(BOOL e)
{ private:
m_flags1 = (m_flags1 ^ (e << 7)) & UNKNOWN3 ^ m_flags1; flag_bitfield m_flags1;
} flag_bitfield m_flags2;
inline void Set8Bit() };
{
m_flags1 &= ~ENABLE_16BIT; #endif // MXVIDEOPARAMFLAGS_H
}
inline void Set16Bit()
{
m_flags1 |= ENABLE_16BIT;
}
inline void Enable16Bit(unsigned char e)
{
m_flags1 = ((e << 5) ^ m_flags1) & ENABLE_16BIT ^ m_flags1;
}
inline void EnableWideViewAngle(BOOL e)
{
m_flags1 = (m_flags1 ^ (e << 6)) & WIDE_VIEW_ANGLE ^ m_flags1;
}
inline void EnableUnknown1(BOOL e)
{
m_flags2 = (m_flags2 ^ ((!e) << 0)) & UNKNOWN1 ^ m_flags2;
}
inline void EnableUnknown2(BOOL e)
{
m_flags2 = (m_flags2 ^ (e << 1)) & UNKNOWN2 ^ m_flags2;
}
inline void EnableUnknown2()
{
m_flags2 |= UNKNOWN2;
}
private:
unsigned char m_flags1;
unsigned char m_flags2;
};
#endif // MXVIDEOPARAMFLAGS_H