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_arrow.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_arrow.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_arrow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index c6882e8646..e1597d7d9f 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_arrow.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -9,7 +9,7 @@ /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); JUT_ASSERT(0, fg != false); @@ -27,10 +27,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(0, mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != NULL); mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL); - JUT_ASSERT(0, mpArw_c != 0); + JUT_ASSERT(0, mpArw_c != NULL); mpArw_c->hide(); mpArw_c->mPane->setAnimation(mpBck); @@ -38,7 +38,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen->search('yajinexl')->setAnimation(mpBpk); mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL); - JUT_ASSERT(0, mpDot_c != 0); + JUT_ASSERT(0, mpDot_c != NULL); mpDot_c->hide(); mpScreen->search('yaj_end')->setAnimation(mpBpk); |