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_meter_string.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_meter_string.cpp')
| -rw-r--r-- | src/d/d_meter_string.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index 781d77bad8..64db4a53b5 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -3,7 +3,7 @@ * UI Mini-Game Text */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_string.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -50,7 +50,7 @@ int dMeterString_c::_create() { } mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive); JUT_ASSERT(0, fg != false); @@ -61,13 +61,13 @@ int dMeterString_c::_create() { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive)); mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(0, mpParentPane != 0); + JUT_ASSERT(0, mpParentPane != NULL); mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL); - JUT_ASSERT(0, mpRootPane != 0); + JUT_ASSERT(0, mpRootPane != NULL); mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL); - JUT_ASSERT(0, mpTextPane != 0); + JUT_ASSERT(0, mpTextPane != NULL); static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast<J2DTextBox*>(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); |