isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-29 19:05:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve match of LegoVideoManager::Create (#612)

Browse source
This commit is contained in:
Christian Semmler 2024-03-01 16:46:28 -05:00 committed by GitHub
parent 0067c24ead
commit baacb42bfb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View file

@ -60,11 +60,11 @@ MxResult LegoVideoManager::CreateDirect3D()
// FUNCTION: LEGO1 0x1007ac40
MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
{
MxBool paletteCreated = FALSE;
MxDriver* driver = NULL;
Direct3DDeviceInfo* device = NULL;
MxResult result = FAILURE;
MxBool paletteCreated = FALSE;
MxS32 deviceNum = -1;
Direct3DDeviceInfo* device = NULL;
MxDriver* driver = NULL;
MxDeviceEnumerate100d9cc8 deviceEnumerate;
Mx3DPointFloat posVec(0.0, 1.25, -50.0);
Mx3DPointFloat dirVec(0.0, 0.0, 1.0);
@ -72,13 +72,12 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
MxMatrix outMatrix;
HWND hwnd = MxOmni::GetInstance()->GetWindowHandle();
MxS32 bits = p_videoParam.Flags().Get16Bit() ? 16 : 8;
MxS32 deviceNum = -1;
if (!p_videoParam.GetPalette()) {
MxPalette* palette = new MxPalette;
p_videoParam.SetPalette(palette);
if (!palette) {
if (!p_videoParam.GetPalette()) {
goto done;
}
paletteCreated = TRUE;
@ -107,7 +106,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
if (deviceNum < 0) {
deviceEnumerate.FUN_1009d210();
deviceNum = deviceEnumerate.FUN_1009d0d0();
deviceEnumerate.GetDevice(deviceNum, driver, device);
deviceNum = deviceEnumerate.GetDevice(deviceNum, driver, device);
}
m_direct3d->SetDevice(deviceEnumerate, driver, device);
@ -193,7 +192,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
m_3dManager->SetPointOfView(*m_viewROI);
m_unk0x100d9d00 = new LegoUnknown100d9d00;
m_render3d = FALSE;
SetRender3D(FALSE);
m_stopWatch = new MxStopWatch;
m_stopWatch->Start();