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

lego1: match MxVideoManager::RealizePalette (#92)

Browse source 
* Match MxVideoManager::RealizePalette

* Rename class

* Name some functions
This commit is contained in:
Christian Semmler 2023-07-21 21:28:13 -04:00 committed by GitHub
parent 9fa08b1017
commit fa5417f58a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
LEGO1/mxdisplaysurface.h Normal file
View file

@ -0,0 +1,34 @@
#ifndef MXDISPLAYSURFACE_H
#define MXDISPLAYSURFACE_H
#include <ddraw.h>
#include "mxcore.h"
#include "mxpalette.h"
#include "mxvideoparam.h"
#include "decomp.h"
// VTABLE 0x100dc768
class MxDisplaySurface : public MxCore
{
public:
MxDisplaySurface();
virtual ~MxDisplaySurface() override;
virtual MxResult Init(MxVideoParam *p_videoParam, LPDIRECTDRAWSURFACE p_surface1, LPDIRECTDRAWSURFACE p_surface2, LPDIRECTDRAWCLIPPER p_clipper);
virtual MxResult Create(MxVideoParam *p_videoParam);
virtual void Clear();
virtual void SetPalette(MxPalette *p_palette);
virtual void vtable24(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
virtual MxBool vtable28(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
virtual MxBool vtable2c(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, MxBool);
virtual MxBool vtable30(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, undefined4, MxBool);
virtual undefined4 vtable34(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
virtual void Display(undefined4, undefined4, undefined4, undefined4, undefined4, undefined4);
virtual undefined4 vtable3c(undefined4*);
virtual undefined4 vtable40(undefined4);
virtual undefined4 vtable44(undefined4, undefined4*, undefined4, undefined4);
};
#endif // MXDISPLAYSURFACE_H

8
LEGO1/mxvideomanager.cpp
View file

@ -25,7 +25,7 @@ int MxVideoManager::Init()
{ {
this->m_pDirectDraw = NULL; this->m_pDirectDraw = NULL;
this->m_unk54 = NULL; this->m_unk54 = NULL;
this->m_unk58 = NULL; this->m_displaySurface = NULL;
this->m_unk5c = 0; this->m_unk5c = 0;
this->m_videoParam.SetPalette(NULL); this->m_videoParam.SetPalette(NULL);
this->m_unk60 = FALSE; this->m_unk60 = FALSE;
@ -45,10 +45,10 @@ MxLong MxVideoManager::RealizePalette(MxPalette *p_palette)
this->m_criticalSection.Enter(); this->m_criticalSection.Enter();
if (p_palette && this->m_videoParam.GetPalette()) if (p_palette && this->m_videoParam.GetPalette()) {
{
p_palette->GetEntries(paletteEntries); p_palette->GetEntries(paletteEntries);
// TODO this->m_videoParam.GetPalette()->SetEntries(paletteEntries);
this->m_displaySurface->SetPalette(this->m_videoParam.GetPalette());
} }
this->m_criticalSection.Leave(); this->m_criticalSection.Leave();

3
LEGO1/mxvideomanager.h
View file

@ -2,6 +2,7 @@
#define MXVIDEOMANAGER_H #define MXVIDEOMANAGER_H
#include "mxunknown100dc6b0.h" #include "mxunknown100dc6b0.h"
#include "mxdisplaysurface.h"
#include "mxvideoparam.h" #include "mxvideoparam.h"
// VTABLE 0x100dc810 // VTABLE 0x100dc810
@ -26,7 +27,7 @@ class MxVideoManager : public MxUnknown100dc6b0
MxVideoParam m_videoParam; MxVideoParam m_videoParam;
LPDIRECTDRAW m_pDirectDraw; LPDIRECTDRAW m_pDirectDraw;
LPDIRECTDRAWSURFACE m_unk54; LPDIRECTDRAWSURFACE m_unk54;
void* m_unk58; MxDisplaySurface *m_displaySurface;
int m_unk5c; int m_unk5c;
MxBool m_unk60; MxBool m_unk60;
}; };