summaryrefslogtreecommitdiff
path: root/ZAPD/ZDisplayList.cpp
diff options
context:
space:
mode:
authorNicholas Estelami <NEstelami@users.noreply.github.com>2023-07-20 19:34:07 -0400
committerGitHub <noreply@github.com>2023-07-20 19:34:07 -0400
commitcb03424254152e4c96d236125ef925f9333e90f4 (patch)
treea070f59cbfd122f5034260469fa71a1f09b5bae9 /ZAPD/ZDisplayList.cpp
parentb62d38046dbc6618b5eb433a0a29560e02bf43a9 (diff)
Updated to use clang-format-14 (#297)
Diffstat (limited to 'ZAPD/ZDisplayList.cpp')
-rw-r--r--ZAPD/ZDisplayList.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp
index 3d34370..98c4d0e 100644
--- a/ZAPD/ZDisplayList.cpp
+++ b/ZAPD/ZDisplayList.cpp
@@ -1645,8 +1645,10 @@ static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count)
bool keyAlreadyOccupied = self->vertices.find(vtxOffset) != self->vertices.end();
- // In some cases a vtxList already exists at vtxOffset. Only override the existing list if the new one is bigger.
- if (!keyAlreadyOccupied || (keyAlreadyOccupied && vtxList.size() > self->vertices[vtxOffset].size()))
+ // In some cases a vtxList already exists at vtxOffset. Only override the existing list
+ // if the new one is bigger.
+ if (!keyAlreadyOccupied ||
+ (keyAlreadyOccupied && vtxList.size() > self->vertices[vtxOffset].size()))
self->vertices[vtxOffset] = vtxList;
}
}
@@ -1894,7 +1896,8 @@ void ZDisplayList::DeclareReferences(const std::string& prefix)
vtxName = StringHelper::Sprintf("%sVtx_%06X", prefix.c_str(), vtxKeys[i]);
auto filepath = Globals::Instance->outputPath / vtxName;
- std::string incStr = StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), "vtx");
+ std::string incStr =
+ StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), "vtx");
Declaration* vtxDecl = parent->AddDeclarationIncludeArray(
vtxKeys[i], incStr, item.size() * 16, "Vtx", vtxName, item.size());