summaryrefslogtreecommitdiff
path: root/src/d/d_kantera_icon_meter.cpp
diff options
context:
space:
mode:
authorLuke Street <luke@street.dev>2026-02-28 21:19:17 -0700
committerGitHub <noreply@github.com>2026-02-28 20:19:17 -0800
commit6a48380461bc9baabe1706ba57ca0cedfa2d0c51 (patch)
tree593e054cfcb0250e63917c58b445a7e1f025a023 /src/d/d_kantera_icon_meter.cpp
parentb5d3b8c059c10711370437f7db7539cd90f1cb29 (diff)
More GCC compatibility/warning fixes (#3118)
* Wrap >4-char literals in a MULTI_CHAR macro Modern compilers do not support CW's non-standard behavior with >4 char literals. We can, however, use a constexpr function to compute the u64 values directly. This leaves <=4 char literals unchanged. * Replace non-pointer usages of NULL with 0 * Define NULL to nullptr on C++11 and above * Fix more -Wpointer-arith and -Woverflow warnings * Replace u32/s32 with uintptr_t/intptr_t where appropriate * JSUOutputStream: Overload all standard int types
Diffstat (limited to 'src/d/d_kantera_icon_meter.cpp')
-rw-r--r--src/d/d_kantera_icon_meter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp
index 431c4c0d30..fa31a962ea 100644
--- a/src/d/d_kantera_icon_meter.cpp
+++ b/src/d/d_kantera_icon_meter.cpp
@@ -31,9 +31,9 @@ void dKantera_icon_c::initiate() {
dPaneClass_showNullPane(scrn);
mpKanteraIcon->setScreen(scrn);
- mpParent = new CPaneMgr(scrn, 'kan_m_n', 2, NULL);
+ mpParent = new CPaneMgr(scrn, MULTI_CHAR('kan_m_n'), 2, NULL);
- mpGauge = new CPaneMgr(scrn, 'yellow_m', 0, NULL);
+ mpGauge = new CPaneMgr(scrn, MULTI_CHAR('yellow_m'), 0, NULL);
}
void dKantera_icon_c::setAlphaRate(f32 alphaRate) {