isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-03 13:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Anonymous Maarten 2024-12-19 21:14:56 +01:00
parent b92e40a7f3
commit c3f3a8a01b
3 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legovideomanager.h
View File

@ -5,8 +5,8 @@
#include "legophonemelist.h" #include "legophonemelist.h"
#include "mxvideomanager.h" #include "mxvideomanager.h"
#include <ddraw.h>
#include <d3drm.h> #include <d3drm.h>
#include <ddraw.h>
class Lego3DManager; class Lego3DManager;
class LegoROI; class LegoROI;

16
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View File

@ -581,7 +581,15 @@ int LegoVideoManager::EnableRMDevice()
if (res == D3DRM_OK) { if (res == D3DRM_OK) {
viewport = NULL; viewport = NULL;
device_impl->SetImplementationData(d3drm_dev2); device_impl->SetImplementationData(d3drm_dev2);
res = d3drm2->CreateViewport(d3drm_dev2, m_camera_0x56c, 0, 0, m_camera_width_0x560, m_camera_height_0x564, &viewport); res = d3drm2->CreateViewport(
d3drm_dev2,
m_camera_0x56c,
0,
0,
m_camera_width_0x560,
m_camera_height_0x564,
&viewport
);
if (res == D3DRM_OK) { if (res == D3DRM_OK) {
viewport->SetBack(m_back_0x558); viewport->SetBack(m_back_0x558);
viewport->SetFront(m_front_0x55c); viewport->SetFront(m_front_0x55c);
@ -635,7 +643,8 @@ int LegoVideoManager::DisableRMDevice()
m_paused = 1; m_paused = 1;
m_direct3d->Direct3D()->AddRef(); m_direct3d->Direct3D()->AddRef();
m_direct3d->Direct3DDevice()->AddRef(); m_direct3d->Direct3DDevice()->AddRef();
} else { }
else {
viewport_array->Release(); viewport_array->Release();
} }
} }
@ -650,7 +659,8 @@ int LegoVideoManager::DisableRMDevice()
} }
if (m_paused) { if (m_paused) {
return 0; return 0;
} else { }
else {
return -1; return -1;
} }
} }

6
LEGO1/tgl/d3drm/texture.cpp
View File

@ -86,7 +86,8 @@ void TglD3DRMIMAGE::Destroy()
delete m_image.palette; delete m_image.palette;
} }
static inline int IsPowerOfTwo(int v) { inline static int IsPowerOfTwo(int v)
{
int m = 0; int m = 0;
while (v > 2 && m == 0) { while (v > 2 && m == 0) {
m = v % 2; m = v % 2;
@ -112,7 +113,8 @@ Result TglD3DRMIMAGE::CreateBuffer(int width, int height, int depth, void* pBuff
if (useBuffer) { if (useBuffer) {
m_texelsAllocatedByClient = 1; m_texelsAllocatedByClient = 1;
m_image.buffer1 = (char*) pBuffer; m_image.buffer1 = (char*) pBuffer;
} else { }
else {
m_image.buffer1 = new char[width * height]; m_image.buffer1 = new char[width * height];
memcpy(m_image.buffer1, pBuffer, width * height); memcpy(m_image.buffer1, pBuffer, width * height);
m_texelsAllocatedByClient = 0; m_texelsAllocatedByClient = 0;