mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +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

42
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@@ -96,8 +96,9 @@ LegoGameState::~LegoGameState()
if (m_stateCount) {
for (MxS16 i = 0; i < m_stateCount; i++) {
LegoState* state = m_stateArray[i];
if (state)
if (state) {
delete state;
}
}
delete[] m_stateArray;
@@ -118,8 +119,9 @@ MxResult LegoGameState::Save(MxULong p_slot)
MxResult result;
InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == NULL)
if (!infocenterState || infocenterState->GetInfocenterBufferElement(0) == NULL) {
result = SUCCESS;
}
else {
result = FAILURE;
MxVariableTable* variableTable = VariableTable();
@@ -134,8 +136,9 @@ MxResult LegoGameState::Save(MxULong p_slot)
fileStream.Write(&m_unk0x0c, 1);
for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) {
return result;
}
}
if (WriteVariable(&fileStream, variableTable, "backgroundcolor") != FAILURE) {
@@ -161,15 +164,17 @@ MxResult LegoGameState::Load(MxULong)
// FUNCTION: LEGO1 0x10039f00
void LegoGameState::SetSavePath(char* p_savePath)
{
if (m_savePath != NULL)
if (m_savePath != NULL) {
delete[] m_savePath;
}
if (p_savePath) {
m_savePath = new char[strlen(p_savePath) + 1];
strcpy(m_savePath, p_savePath);
}
else
else {
m_savePath = NULL;
}
}
// FUNCTION: LEGO1 0x10039f70
@@ -183,8 +188,9 @@ MxResult LegoGameState::WriteVariable(LegoStorage* p_stream, MxVariableTable* p_
if (p_stream->Write((char*) &length, 1) == SUCCESS) {
if (p_stream->Write(p_variableName, length) == SUCCESS) {
length = strlen(variableValue);
if (p_stream->Write((char*) &length, 1) == SUCCESS)
if (p_stream->Write((char*) &length, 1) == SUCCESS) {
result = p_stream->Write((char*) variableValue, length);
}
}
}
}
@@ -195,8 +201,9 @@ MxResult LegoGameState::WriteVariable(LegoStorage* p_stream, MxVariableTable* p_
MxResult LegoGameState::WriteEndOfVariables(LegoStorage* p_stream)
{
MxU8 len = strlen(g_endOfVariables);
if (p_stream->Write(&len, 1) == SUCCESS)
if (p_stream->Write(&len, 1) == SUCCESS) {
return p_stream->Write(g_endOfVariables, len);
}
return FAILURE;
}
@@ -212,9 +219,10 @@ MxS32 LegoGameState::ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to)
char nameBuffer[256];
if (p_stream->Read(nameBuffer, length) == SUCCESS) {
nameBuffer[length] = '\0';
if (strcmp(nameBuffer, g_endOfVariables) == 0)
if (strcmp(nameBuffer, g_endOfVariables) == 0) {
// 2 -> "This was the last entry, done reading."
result = 2;
}
else {
if (p_stream->Read((char*) &length, 1) == SUCCESS) {
char valueBuffer[256];
@@ -237,8 +245,9 @@ void LegoGameState::GetFileSavePath(MxString* p_outPath, MxULong p_slotn)
char path[1024] = "";
// Save path base
if (m_savePath != NULL)
if (m_savePath != NULL) {
strcpy(path, m_savePath);
}
// Slot: "G0", "G1", ...
strcat(path, "\\G");
@@ -491,9 +500,11 @@ MxBool ROIHandlerFunction(char* p_input, char* p_output, MxU32 p_copyLen)
// FUNCTION: LEGO1 0x1003bbb0
LegoState* LegoGameState::GetState(const char* p_stateName)
{
for (MxS32 i = 0; i < m_stateCount; ++i)
if (m_stateArray[i]->IsA(p_stateName))
for (MxS32 i = 0; i < m_stateCount; ++i) {
if (m_stateArray[i]->IsA(p_stateName)) {
return m_stateArray[i];
}
}
return NULL;
}
@@ -510,9 +521,11 @@ LegoState* LegoGameState::CreateState(const char* p_stateName)
void LegoGameState::RegisterState(LegoState* p_state)
{
MxS32 targetIndex;
for (targetIndex = 0; targetIndex < m_stateCount; ++targetIndex)
if (m_stateArray[targetIndex]->IsA(p_state->ClassName()))
for (targetIndex = 0; targetIndex < m_stateCount; ++targetIndex) {
if (m_stateArray[targetIndex]->IsA(p_state->ClassName())) {
break;
}
}
if (targetIndex == m_stateCount) {
LegoState** newBuffer = new LegoState*[m_stateCount + 1];
@@ -527,8 +540,9 @@ void LegoGameState::RegisterState(LegoState* p_state)
return;
}
if (m_stateArray[targetIndex])
if (m_stateArray[targetIndex]) {
delete m_stateArray[targetIndex];
}
m_stateArray[targetIndex] = p_state;
}