summaryrefslogtreecommitdiff
path: root/src/d/d_meter_hakusha.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_meter_hakusha.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_meter_hakusha.cpp')
-rw-r--r--src/d/d_meter_hakusha.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp
index 8e11b76757..8c4c25d624 100644
--- a/src/d/d_meter_hakusha.cpp
+++ b/src/d/d_meter_hakusha.cpp
@@ -26,7 +26,7 @@ dMeterHakusha_c::~dMeterHakusha_c() {
int dMeterHakusha_c::_create() {
static u64 haku_tag[] = {
- 'haku_n00', 'haku_n01', 'haku_n02', 'haku_n03', 'haku_n04', 'haku_n05',
+ MULTI_CHAR('haku_n00'), MULTI_CHAR('haku_n01'), MULTI_CHAR('haku_n02'), MULTI_CHAR('haku_n03'), MULTI_CHAR('haku_n04'), MULTI_CHAR('haku_n05'),
};
for (int i = 0; i < 6; i++) {
@@ -34,7 +34,7 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, mpHakushaPos[i] != NULL);
}
- mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL);
+ mpHakushaParent = new CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL);
JUT_ASSERT(0, mpHakushaParent != NULL);
mpHakushaScreen = new J2DScreen();
@@ -45,10 +45,10 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpHakushaScreen);
- mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL);
+ mpHakushaOn = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOn != NULL);
- mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL);
+ mpHakushaOff = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOff != NULL);
mpHakushaOn->setAlphaRate(0.0f);
@@ -74,12 +74,12 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpButtonScreen);
- mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL);
+ mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonA != NULL);
mpButtonA->show();
mpButtonA->setAlphaRate(0.0f);
- mpButtonScreen->search('info_n')->translate(0.0f, 0.0f);
+ mpButtonScreen->search(MULTI_CHAR('info_n'))->translate(0.0f, 0.0f);
field_0x100 = g_drawHIO.mButtonAHorsePosX;
field_0x104 = g_drawHIO.mButtonAHorsePosY;