summaryrefslogtreecommitdiff
path: root/src/d/d_font_manager.cpp
diff options
context:
space:
mode:
authorElijah Thomas <42302100+elijah-thomas774@users.noreply.github.com>2024-10-16 15:36:02 -0400
committerGitHub <noreply@github.com>2024-10-16 15:36:02 -0400
commit26af4db82da23364961ebb440efba88846240731 (patch)
tree9cfe6a427cfe59c13c64928ccef6ba3c5ccfec21 /src/d/d_font_manager.cpp
parent4543ec129ec02649b24ae0e20d8325a5f066c9b1 (diff)
update from dtk-template - clangd :) (#66)
* update from dtk-template and start work towards using clangd * include <a> -> "a" * Update build.yml * remove/add non-trivial class in union warning
Diffstat (limited to 'src/d/d_font_manager.cpp')
-rw-r--r--src/d/d_font_manager.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/d/d_font_manager.cpp b/src/d/d_font_manager.cpp
index 2e15c4f8..c992484b 100644
--- a/src/d/d_font_manager.cpp
+++ b/src/d/d_font_manager.cpp
@@ -1,12 +1,15 @@
-#include <d/d_font_manager.h>
-#include <d/d_heap.h>
-#include <sized_string.h>
+#include "d/d_font_manager.h"
+
+#include "d/d_heap.h"
+#include "sized_string.h"
+
static dFontMng_c l_dFontMng_obj[3];
static const char *systemFonts[] = {"normal_00.brfnt", "special_00.brfnt", "picture_00.brfnt"};
-static const char *fonts[] = {"normal_00.brfnt", "normal_01.brfnt", "special_00.brfnt", "special_01.brfnt",
- "picture_00.brfnt"};
+static const char *fonts[] = {
+ "normal_00.brfnt", "normal_01.brfnt", "special_00.brfnt", "special_01.brfnt", "picture_00.brfnt"
+};
// TODO What's up with these?
char dFontMng_c::normal_01[] = "normal_01.brfnt";
@@ -62,7 +65,8 @@ bool dFontMng_c::create() {
if (l_dFontMng_obj[i].mpFontFile == nullptr) {
const char *path = getFontPath(i);
nw4r::ut::BinaryFileHeader *file = static_cast<nw4r::ut::BinaryFileHeader *>(
- l_dFontMng_obj[i].mLoader.request(path, 0, dHeap::fontHeap.heap));
+ l_dFontMng_obj[i].mLoader.request(path, 0, dHeap::fontHeap.heap)
+ );
if (file == nullptr) {
return false;
}