isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Joshua Peisach 2023-12-29 16:54:08 -05:00
parent d2fcba1c69
commit 4d3af00c86
No known key found for this signature in database
GPG Key ID: 41C3D4189AFEDB5A
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
LEGO1/mxdisplaysurface.cpp
View File

@ -2,6 +2,7 @@
#include "mxomni.h" #include "mxomni.h"
#include "mxvideomanager.h" #include "mxvideomanager.h"
#include <windows.h> #include <windows.h>
DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac); DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
@ -77,10 +78,10 @@ byte CountTotalBitsSetTo1(MxU32 p_param)
{ {
MxU32 a; MxU32 a;
byte i = 0; byte i = 0;
if(p_param) { if (p_param) {
do { do {
a = i >> 1; a = i >> 1;
i += ((byte)p_param & 1); i += ((byte) p_param & 1);
p_param = a; p_param = a;
} while (a != 0); } while (a != 0);
} }
@ -92,9 +93,9 @@ byte CountContiguousBitsSetTo1(MxU32 p_param)
{ {
MxU32 u; MxU32 u;
byte count = 0; byte count = 0;
u = p_param & 1; u = p_param & 1;
while(u == 0) { while (u == 0) {
p_param >>= 1; p_param >>= 1;
count++; count++;
u = p_param & 1; u = p_param & 1;
@ -255,15 +256,15 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
HPALETTE hpal; HPALETTE hpal;
LOGPALETTE lpal; LOGPALETTE lpal;
byte bVar2; byte bVar2;
byte bVar3; byte bVar3;
byte bVar4; byte bVar4;
byte bVar5; byte bVar5;
byte bVar6; byte bVar6;
byte bVar7; byte bVar7;
if(((this->m_surfaceDesc).ddpfPixelFormat.dwFlags & 0x20) != 0) { if (((this->m_surfaceDesc).ddpfPixelFormat.dwFlags & 0x20) != 0) {
this->m_ddSurface1->SetPalette(p_palette->CreateNativePalette()); this->m_ddSurface1->SetPalette(p_palette->CreateNativePalette());
this->m_ddSurface2->SetPalette(p_palette->CreateNativePalette()); this->m_ddSurface2->SetPalette(p_palette->CreateNativePalette());
if(((this->m_videoParam).Flags().GetFullScreen() & 1) == 0) { if (((this->m_videoParam).Flags().GetFullScreen() & 1) == 0) {
lpal.palVersion = 0x300; lpal.palVersion = 0x300;
// lpal.palNumEntries = 256; // lpal.palNumEntries = 256;
// FIXME: this loop may be incorrect // FIXME: this loop may be incorrect
@ -278,19 +279,19 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
DeleteObject(hpal); DeleteObject(hpal);
} }
} }
if((this->m_surfaceDesc).ddpfPixelFormat.dwRGBBitCount == 16) { if ((this->m_surfaceDesc).ddpfPixelFormat.dwRGBBitCount == 16) {
if(this->m_16bitPal == NULL) { if (this->m_16bitPal == NULL) {
this->m_16bitPal = new(MxU16); // FIXME: malloc size 512; this->m_16bitPal = new (MxU16); // FIXME: malloc size 512;
} }
p_palette->GetEntries((PALETTEENTRY*) &lpal); // ? p_palette->GetEntries((PALETTEENTRY*) &lpal); // ?
// It looks like the arguments are correct - the offsets match but the registers are swapped // It looks like the arguments are correct - the offsets match but the registers are swapped
bVar2 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwRBitMask); bVar2 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwRBitMask);
bVar3 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwRBitMask); bVar3 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwRBitMask);
bVar4 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwGBitMask); bVar4 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwGBitMask);
bVar5 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwGBitMask); bVar5 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwGBitMask);
bVar6 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwBBitMask); bVar6 = CountContiguousBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwBBitMask);
bVar7 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwBBitMask); bVar7 = CountTotalBitsSetTo1((this->m_surfaceDesc).ddpfPixelFormat.dwBBitMask);
MxS32 i = 0; MxS32 i = 0;
WORD e = lpal.palNumEntries; WORD e = lpal.palNumEntries;
@ -298,7 +299,8 @@ void MxDisplaySurface::SetPalette(MxPalette* p_palette)
j = i + 2; j = i + 2;
// this line is probably very incorrect // this line is probably very incorrect
*this->m_16bitPal = e >> (8 - bVar3 & 0x1f) << (bVar2 & 0x1f) | e >> (8 - bVar5 & 0x1f) << (bVar4 & 0x1f) | e >> (8 - bVar7 & 0x1f) << (bVar6 & 0x1f); *this->m_16bitPal = e >> (8 - bVar3 & 0x1f) << (bVar2 & 0x1f) | e >> (8 - bVar5 & 0x1f) << (bVar4 & 0x1f) |
e >> (8 - bVar7 & 0x1f) << (bVar6 & 0x1f);
i = j; i = j;
e += 2; e += 2;
} while (j < 512); } while (j < 512);