mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-27 18:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake+ci: run clang-tidy (#512)

Browse Source 
* cmake+ci: run clang-tidy

* Remove DESCRIPTION from LEGO1/LegoOmni.mingw.def

* Add initial .clang-tidy and fixes

* fix file perms

* Comment out DESCRIPTION

* Remove LegoEntity::~LegoEntity and MxPresenter::~MxPresenter from mingw's LEGO1.def

* Looks like clang is allergic to the libs in the directx5 SDK

* Update .clang-tidy

* Fix typo in .clang-tidy

* Attempt to generate an action error

* Revert "Attempt to generate an action error"

This reverts commit 96c4c65fed.

* cmake: test with -Wparentheses + optionally with -Werror

* ci: -k0 is a Ninja argument

* Use -Werror only for msys2 builds

* cmake: only emit warnings for specific warnings

* cmake: and don't do -Werror/-WX anymore

* Fix warnings

* Fix mingw warnings

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Anonymous Maarten
2024-02-01 21:42:10 +01:00
committed by GitHub
parent 97d1ba7c71
commit 9e686e2a87
308 changed files with 2863 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
LEGO1/omni/src/video/mxsmack.cpp
View File

@@ -40,8 +40,9 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
// TODO
for (MxU32 i = 0; i < FRAME_COUNT(p_mxSmack); i++) {
if (p_mxSmack->m_maxFrameSize < frameSizes[i])
if (p_mxSmack->m_maxFrameSize < frameSizes[i]) {
p_mxSmack->m_maxFrameSize = frameSizes[i];
}
}
frameTypes = new MxU8[FRAME_COUNT(p_mxSmack)];
@@ -54,8 +55,9 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
p_data += FRAME_COUNT(p_mxSmack);
MxU32 treeSize = p_mxSmack->m_smackTag.tablesize + 0x1000;
if (treeSize <= 0x2000)
if (treeSize <= 0x2000) {
treeSize = 0x2000;
}
huffmanTrees = new MxU8[treeSize];
@@ -127,16 +129,21 @@ MxResult MxSmack::LoadHeader(MxU8* p_data, MxSmack* p_mxSmack)
// FUNCTION: LEGO1 0x100c5d40
void MxSmack::Destroy(MxSmack* p_mxSmack)
{
if (p_mxSmack->m_frameSizes)
if (p_mxSmack->m_frameSizes) {
delete[] p_mxSmack->m_frameSizes;
if (p_mxSmack->m_frameTypes)
}
if (p_mxSmack->m_frameTypes) {
delete[] p_mxSmack->m_frameTypes;
if (p_mxSmack->m_huffmanTrees)
}
if (p_mxSmack->m_huffmanTrees) {
delete[] p_mxSmack->m_huffmanTrees;
if (p_mxSmack->m_huffmanTables)
}
if (p_mxSmack->m_huffmanTables) {
delete[] p_mxSmack->m_huffmanTables;
if (p_mxSmack->m_unk0x6b4)
}
if (p_mxSmack->m_unk0x6b4) {
delete[] p_mxSmack->m_unk0x6b4;
}
}
// This should be refactored to somewhere else
@@ -223,12 +230,14 @@ MxBool MxSmack::GetRect(MxU8* p_unk0x6b4, MxU16* p_und, u32* p_smackRect, MxRect
{
u32 left, bottom, top, right;
if (!*p_und)
if (!*p_und) {
return FALSE;
}
if (*p_und == 1) {
if (!SmackGetRect(p_unk0x6b4, p_smackRect))
if (!SmackGetRect(p_unk0x6b4, p_smackRect)) {
return FALSE;
}
*p_und = 2;
}
@@ -238,10 +247,12 @@ MxBool MxSmack::GetRect(MxU8* p_unk0x6b4, MxU16* p_und, u32* p_smackRect, MxRect
bottom = p_smackRect[3] + p_smackRect[1];
while (SmackGetRect(p_unk0x6b4, p_smackRect)) {
if (left > p_smackRect[0])
if (left > p_smackRect[0]) {
left = p_smackRect[0];
if (right < p_smackRect[0] + p_smackRect[2])
}
if (right < p_smackRect[0] + p_smackRect[2]) {
right = p_smackRect[0] + p_smackRect[2];
}
bottom = p_smackRect[1] + p_smackRect[3];
}