diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-28 16:11:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 13:11:07 -0700 |
| commit | 9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch) | |
| tree | dde3385855941d12a306de3ca8fb316338be288b /src/d/d_msg_scrn_jimaku.cpp | |
| parent | c9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff) | |
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define
* Switch names that appear in asserts to be constants instead of defines
* Replace `0` in asserts with `NULL` or `FALSE`
* Fix fpclassify
* Fix ARRAY_SIZE
* Use G_CM3D_F_INF
* More fixes for fpclassify
* Remove FLOAT_LABEL
* Remove incorrect FLAG_ON macro
* Remove UNK_BSS macro
* Silence clangd unused header warning for PCH
Diffstat (limited to 'src/d/d_msg_scrn_jimaku.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_jimaku.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 0344e05143..5991245e5b 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_jimaku.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -25,7 +25,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { init(); mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000, dComIfGp_getMsgCommonArchive()); @@ -33,15 +33,15 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { dPaneClass_showNullPane(mpScreen); mpLight_c = new dMsgScrnLight_c(0, param_0); - JUT_ASSERT(0, mpLight_c != 0); + JUT_ASSERT(0, mpLight_c != NULL); void* mpBuf = heap->alloc(0x106A, 0x20); - JUT_ASSERT(0, mpBuf != 0); + JUT_ASSERT(0, mpBuf != NULL); memset(mpBuf, 0, 0x106A); mCharInfoPtr = (CharInfo_c*)mpBuf; mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL); - JUT_ASSERT(0, mpPmP_c != 0); + JUT_ASSERT(0, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5]; mpPmP_c->paneTrans(0.0f, field_0xcc); @@ -67,10 +67,10 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { } #else mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(0, mpTm_c[0] != 0); + JUT_ASSERT(0, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); - JUT_ASSERT(0, mpTm_c[1] != 0); + JUT_ASSERT(0, mpTm_c[1] != NULL); mpScreen->search('n_3line')->hide(); mpScreen->search('n_3fline')->hide(); |