clang fix

Author: Dutchman101

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -2431,8 +2431,7 @@ namespace
                 auto*                slot = pTxdPoolSA->GetTextureDictonarySlot(existingTxdId);
                 // Also accept usParentIndex==0xFFFF: the slot was created with the same parent
                 // but the parent TXD wasn't loaded yet, so parent-chain setup is still pending.
-                if (slot && slot->rwTexDictonary &&
-                    (slot->usParentIndex == usParentTxdId || slot->usParentIndex == static_cast<unsigned short>(-1)))
+                if (slot && slot->rwTexDictonary && (slot->usParentIndex == usParentTxdId || slot->usParentIndex == static_cast<unsigned short>(-1)))
                 {
                     g_IsolatedModelByTxd[existingTxdId] = usModelId;
                     if (pModelInfo->GetTextureDictionaryID() != existingTxdId)
@@ -2746,8 +2745,7 @@ void CRenderWareSA::ProcessPendingIsolatedModels()
             // functioning parent chain; clear them regardless of whether the child TXD is live.
             const auto* pTimeoutChildSlot = pTxdPoolSA->GetTextureDictonarySlot(childTxdId);
             const bool  bIsIncompleteVanillaSlot =
-                pModelInfo->GetParentID() == 0 && pTimeoutChildSlot &&
-                pTimeoutChildSlot->usParentIndex == static_cast<unsigned short>(-1);
+                pModelInfo->GetParentID() == 0 && pTimeoutChildSlot && pTimeoutChildSlot->usParentIndex == static_cast<unsigned short>(-1);
             if (!bIsIncompleteVanillaSlot && pModelInfo->GetTextureDictionaryID() == childTxdId && CTxdStore_GetTxd(childTxdId) != nullptr)
                 continue;
 
@@ -2770,11 +2768,9 @@ void CRenderWareSA::ProcessPendingIsolatedModels()
             // GetParentID()==0: vanilla model owns its TXD directly (no clone parent).
             // AllocateIsolatedTxdForVanillaModel stores usParentIndex=0xFFFF when the parent
             // TXD is not yet loaded; detect that state and complete setup here once it arrives.
-            auto* pChildSlot = pTxdPoolSA->GetTextureDictonarySlot(childTxdId);
-            const bool bIsDeferredVanillaSetup =
-                pChildSlot && pChildSlot->rwTexDictonary &&
-                pChildSlot->usParentIndex == static_cast<unsigned short>(-1) &&
-                pModelInfo->GetTextureDictionaryID() == childTxdId;
+            auto*      pChildSlot = pTxdPoolSA->GetTextureDictonarySlot(childTxdId);
+            const bool bIsDeferredVanillaSetup = pChildSlot && pChildSlot->rwTexDictonary && pChildSlot->usParentIndex == static_cast<unsigned short>(-1) &&
+                                                 pModelInfo->GetTextureDictionaryID() == childTxdId;
 
             if (bIsDeferredVanillaSetup)
             {

Client/loader/MainFunctions.cpp

@@ -253,8 +253,8 @@ static DWORD RunDebuggerLoop(HANDLE hProcess, DWORD processId, DebuggerCrashCapt
                                 // These are deliberate security fastfails.
                                 if (!IsNetcModule(capture.moduleInfo.moduleName))
                                 {
-                                    WriteFailFastDump(hProcess, processId, debugEvent.dwThreadId, &debugEvent.u.Exception.ExceptionRecord, &capture.threadContext,
-                                                      capture);
+                                    WriteFailFastDump(hProcess, processId, debugEvent.dwThreadId, &debugEvent.u.Exception.ExceptionRecord,
+                                                      &capture.threadContext, capture);
                                 }
                                 else
                                 {
@@ -2110,8 +2110,7 @@ int LaunchGame(SString strCmdLine)
                                    "MTA: San Andreas has been terminated due to an integrity violation.\n\n"
                                    "Make sure that no external program is modifying the game. Note that some unreliable "
                                    "AV's (such as Bitdefender) are known to interfere in a way that can lead to this problem.",
-                                   "MTA: San Andreas",
-                                   MB_OK | MB_ICONWARNING | MB_TOPMOST);
+                                   "MTA: San Andreas", MB_OK | MB_ICONWARNING | MB_TOPMOST);
                 }
                 else
                 {
@@ -2138,17 +2137,16 @@ int LaunchGame(SString strCmdLine)
                 if (werInfo.found && IsFailFastException(werInfo.exceptionCode) && IsNetcModule(werInfo.moduleName))
                 {
                     isAcDefense = true;
-                    AddReportLog(7210, SString("Loader - AC integrity exit detected via WER (module=%s code=0x%08X)",
-                                               werInfo.moduleName.c_str(), static_cast<unsigned int>(werInfo.exceptionCode)));
+                    AddReportLog(7210, SString("Loader - AC integrity exit detected via WER (module=%s code=0x%08X)", werInfo.moduleName.c_str(),
+                                               static_cast<unsigned int>(werInfo.exceptionCode)));
                     // Mark WER report as handled so _CheckForWerCrash does not reprocess it on next launch
                     if (!werInfo.reportId.empty())
                         SetApplicationSetting("diagnostics", "last-wer-report-shown", werInfo.reportId);
                     MessageBoxUTF8(nullptr,
                                    "MTA: San Andreas has been terminated due to an AC integrity violation.\n\n"
                                    "Make sure that no external program is modifying the game. Note that some unreliable "
                                    "AV's (such as Bitdefender) are known to interfere in a way that can lead to this problem.",
-                                   "MTA: San Andreas",
-                                   MB_OK | MB_ICONWARNING | MB_TOPMOST);
+                                   "MTA: San Andreas", MB_OK | MB_ICONWARNING | MB_TOPMOST);
                 }
                 else if (werInfo.found)
                 {