Skip to content

Commit 2eaafc1

Browse files
committed
Addendum to last (clang-format)
1 parent 0a4cb09 commit 2eaafc1

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,10 +1796,7 @@ CModelTexturesInfo* CRenderWareSA::GetModelTexturesInfo(unsigned short usModelId
17961796
CStreamingInfo* pStreamInfo = pGame->GetStreaming()->GetStreamingInfo(uiTxdStreamId);
17971797

17981798
auto IsBusyStreaming = [](CStreamingInfo* pInfo) -> bool
1799-
{
1800-
return pInfo && (pInfo->loadState == eModelLoadState::LOADSTATE_READING ||
1801-
pInfo->loadState == eModelLoadState::LOADSTATE_FINISHING);
1802-
};
1799+
{ return pInfo && (pInfo->loadState == eModelLoadState::LOADSTATE_READING || pInfo->loadState == eModelLoadState::LOADSTATE_FINISHING); };
18031800

18041801
if (IsBusyStreaming(pStreamInfo))
18051802
{
@@ -1935,10 +1932,7 @@ CModelTexturesInfo* CRenderWareSA::GetModelTexturesInfo(unsigned short usModelId
19351932
CStreamingInfo* pStreamInfo = pGame->GetStreaming()->GetStreamingInfo(uiTxdStreamId);
19361933

19371934
auto IsBusyStreaming = [](CStreamingInfo* pInfo) -> bool
1938-
{
1939-
return pInfo && (pInfo->loadState == eModelLoadState::LOADSTATE_READING ||
1940-
pInfo->loadState == eModelLoadState::LOADSTATE_FINISHING);
1941-
};
1935+
{ return pInfo && (pInfo->loadState == eModelLoadState::LOADSTATE_READING || pInfo->loadState == eModelLoadState::LOADSTATE_FINISHING); };
19421936

19431937
if (IsBusyStreaming(pStreamInfo))
19441938
return nullptr;
@@ -2496,10 +2490,8 @@ bool CRenderWareSA::ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTe
24962490
perTxdInfo.replacedOriginals.resize(perTxdInfo.usingTextures.size(), nullptr);
24972491

24982492
const auto& masterTexturesVec = pReplacementTextures->textures;
2499-
auto IsMasterTexture = [&masterTexturesVec](RwTexture* pTex) -> bool
2500-
{
2501-
return std::find(masterTexturesVec.begin(), masterTexturesVec.end(), pTex) != masterTexturesVec.end();
2502-
};
2493+
auto IsMasterTexture = [&masterTexturesVec](RwTexture* pTex) -> bool
2494+
{ return std::find(masterTexturesVec.begin(), masterTexturesVec.end(), pTex) != masterTexturesVec.end(); };
25032495

25042496
RwTexDictionary* const pTargetTxd = pInfo->pTxd;
25052497
const bool bTargetTxdOk = pTargetTxd != nullptr;

0 commit comments

Comments
 (0)