From 6a48380461bc9baabe1706ba57ca0cedfa2d0c51 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 21:19:17 -0700 Subject: 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 --- src/d/d_msg_scrn_explain.cpp | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/d/d_msg_scrn_explain.cpp') diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index a68029cc23..7387b36a6c 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -82,7 +82,7 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(119, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); JUT_ASSERT(124, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); @@ -91,9 +91,9 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); #if VERSION == VERSION_GCN_JPN field_0x50 = 0.0f; @@ -107,36 +107,36 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(153, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpScreen->search('n_all')->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, + mpScreen->search(MULTI_CHAR('n_all'))->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN field_0x50 = 0.0f; if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, 'mg_3f', 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s', 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->show(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else field_0x50 = -10.0f; - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(162, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); @@ -145,9 +145,9 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->show(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif if (param_1 == 2 || param_1 == 4) { @@ -178,17 +178,17 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs } } - mpScreen->search('mg_null')->move( - g_MsgObject_HIO_c.mTextPosX + mpScreen->search('mg_null')->getBounds().i.x, - g_MsgObject_HIO_c.mTextPosY + mpScreen->search('mg_null')->getBounds().i.y); + mpScreen->search(MULTI_CHAR('mg_null'))->move( + g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x, + g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); - mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(241, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); + mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(244, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); + mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(247, mpMg_c[1] != NULL); mpRoot_c[0] = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); @@ -296,7 +296,7 @@ void dMsgScrnExplain_c::move() { (this->*init_process[mStatus])(); } - mpScreen->search('n_all')->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, + mpScreen->search(MULTI_CHAR('n_all'))->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); } -- cgit v1.2.3