Match LegoVideoManager::EnableFullScreenMovie

This commit is contained in:
Christian Semmler 2023-12-21 10:41:31 -05:00
parent c2f853998e
commit fc6fb97ae6
4 changed files with 19 additions and 15 deletions

View File

@ -85,14 +85,14 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
m_palette = m_videoParam.GetPalette()->Clone(); m_palette = m_videoParam.GetPalette()->Clone();
OverrideSkyColor(FALSE); OverrideSkyColor(FALSE);
m_videoParam.Flags().SetF1bit7(p_scale); m_displaySurface->GetVideoParam().Flags().SetF1bit3(p_scale);
m_unk0xe4 = FALSE; m_unk0xe4 = FALSE;
m_unk0x500 = TRUE; m_unk0x500 = TRUE;
} }
else { else {
m_displaySurface->FUN_100ba640(); m_displaySurface->FUN_100ba640();
m_videoParam.Flags().SetF1bit7(p_scale); m_displaySurface->GetVideoParam().Flags().SetF1bit3(FALSE);
// restore previous pallete // restore previous pallete
RealizePalette(m_palette); RealizePalette(m_palette);
@ -106,20 +106,21 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
m_videoParam.GetRect().GetRight() - m_videoParam.GetRect().GetLeft(), m_videoParam.GetRect().GetRight() - m_videoParam.GetRect().GetLeft(),
m_videoParam.GetRect().GetBottom() - m_videoParam.GetRect().GetTop() m_videoParam.GetRect().GetBottom() - m_videoParam.GetRect().GetTop()
); );
InvalidateRect(rect); InvalidateRect(rect);
UpdateRegion(); UpdateRegion();
OverrideSkyColor(TRUE); OverrideSkyColor(TRUE);
m_unk0xe4 = TRUE; m_unk0xe4 = TRUE;
m_unk0x500 = FALSE; m_unk0x500 = FALSE;
} }
} }
if (p_enable) { if (p_enable) {
m_videoParam.Flags().SetF1bit7(p_scale); m_displaySurface->GetVideoParam().Flags().SetF1bit3(p_scale);
} }
else { else {
m_videoParam.Flags().SetF1bit7(FALSE); m_displaySurface->GetVideoParam().Flags().SetF1bit3(FALSE);
} }
} }
@ -139,6 +140,12 @@ void LegoVideoManager::SetSkyColor(float p_red, float p_green, float p_blue)
// m_3dManager->m_pViewport->VTable0x1c(red, green, blue) // m_3dManager->m_pViewport->VTable0x1c(red, green, blue)
} }
// FUNCTION: LEGO1 0x1007c4c0
void LegoVideoManager::OverrideSkyColor(MxBool p_shouldOverride)
{
this->m_videoParam.GetPalette()->SetOverrideSkyColor(p_shouldOverride);
}
// STUB: LEGO1 0x1007c560 // STUB: LEGO1 0x1007c560
int LegoVideoManager::EnableRMDevice() int LegoVideoManager::EnableRMDevice()
{ {

View File

@ -21,20 +21,15 @@ class LegoVideoManager : public MxVideoManager {
__declspec(dllexport) void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale); __declspec(dllexport) void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
__declspec(dllexport) void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY); __declspec(dllexport) void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
inline Lego3DManager* Get3DManager() { return this->m_3dManager; } virtual void Destroy() override; // vtable+0x18
inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
void SetSkyColor(float p_red, float p_green, float p_blue); void SetSkyColor(float p_red, float p_green, float p_blue);
void OverrideSkyColor(MxBool p_shouldOverride);
inline Lego3DManager* Get3DManager() { return this->m_3dManager; }
inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
inline void SetUnkE4(MxBool p_unk0xe4) { this->m_unk0xe4 = p_unk0xe4; } inline void SetUnkE4(MxBool p_unk0xe4) { this->m_unk0xe4 = p_unk0xe4; }
// FUNCTION: LEGO1 0x1007c4c0
void OverrideSkyColor(MxBool p_shouldOverride)
{
this->m_videoParam.GetPalette()->SetOverrideSkyColor(p_shouldOverride);
}
virtual void Destroy() override; // vtable+0x18
private: private:
undefined4 m_unk0x64; undefined4 m_unk0x64;
Lego3DManager* m_3dManager; // 0x68 Lego3DManager* m_3dManager; // 0x68

View File

@ -69,6 +69,7 @@ class MxDisplaySurface : public MxCore {
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; } inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; } inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
inline MxVideoParam& GetVideoParam() { return this->m_videoParam; }
private: private:
MxVideoParam m_videoParam; MxVideoParam m_videoParam;

View File

@ -25,6 +25,7 @@ class MxPalette : public MxCore {
MxResult SetSkyColor(LPPALETTEENTRY p_skyColor); MxResult SetSkyColor(LPPALETTEENTRY p_skyColor);
void Reset(MxBool p_ignoreSkyColor); void Reset(MxBool p_ignoreSkyColor);
LPDIRECTDRAWPALETTE CreateNativePalette(); LPDIRECTDRAWPALETTE CreateNativePalette();
inline void SetOverrideSkyColor(MxBool p_value) { this->m_overrideSkyColor = p_value; } inline void SetOverrideSkyColor(MxBool p_value) { this->m_overrideSkyColor = p_value; }
private: private: