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_menu_fmap2D.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_menu_fmap2D.cpp')
| -rw-r--r-- | src/d/d_menu_fmap2D.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 2a81428eed..d73ea252e0 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_fmap2D // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fmap2D.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -157,7 +157,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { initiate(dComIfGp_getFmapResArchive()); mpBackScreen = new J2DScreen(); - JUT_ASSERT(238, mpBackScreen != 0); + JUT_ASSERT(238, mpBackScreen != NULL); bool fg = mpBackScreen->setPriority("zelda_map_screen_stone_base.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -166,7 +166,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpBackScreen); mpBaseScreen = new J2DScreen(); - JUT_ASSERT(248, mpBaseScreen != 0) + JUT_ASSERT(248, mpBaseScreen != NULL) fg = mpBaseScreen->setPriority("zelda_map_screen_base.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -181,27 +181,27 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { mAnmFrame = 0.0; mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); - JUT_ASSERT(264, mpBaseRoot != 0); + JUT_ASSERT(264, mpBaseRoot != NULL); mpMapArea = new CPaneMgr(mpBaseScreen, 'center_n', 0, NULL); - JUT_ASSERT(269, mpMapArea != 0); + JUT_ASSERT(269, mpMapArea != NULL); mpMapBlack = new CPaneMgr(mpBaseScreen, 'map_blak', 0, NULL); - JUT_ASSERT(273, mpMapBlack != 0); + JUT_ASSERT(273, mpMapBlack != NULL); mpMeterHaihai = new dMeterHaihai_c(1); - JUT_ASSERT(277, mpMeterHaihai != 0); + JUT_ASSERT(277, mpMeterHaihai != NULL); ResTIMG* backTexResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpBackTex = new J2DPicture(backTexResource); - JUT_ASSERT(282, mpBackTex != 0); + JUT_ASSERT(282, mpBackTex != NULL); mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mpBackTex->setAlpha(0); mpPointScreen = new J2DScreen(); - JUT_ASSERT(293, mpPointScreen != 0); + JUT_ASSERT(293, mpPointScreen != NULL); fg = mpPointScreen->setPriority("zelda_field_map_point_cursor.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -210,7 +210,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpPointScreen); mpPointParent = new CPaneMgr(mpPointScreen, 'f_po_n', 2, NULL); - JUT_ASSERT(301, mpPointParent != 0); + JUT_ASSERT(301, mpPointParent != NULL); mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale); @@ -444,7 +444,7 @@ void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_ } mpAreaTex[i_regionNo] = new J2DPicture(i_timg); - JUT_ASSERT(763, mpAreaTex[i_regionNo] != 0); + JUT_ASSERT(763, mpAreaTex[i_regionNo] != NULL); mRegionOriginX[i_regionNo] = i_originX; mRegionOriginZ[i_regionNo] = i_originZ; @@ -626,7 +626,7 @@ void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) { if (mpSpotTexture == NULL) { mpSpotTexture = new J2DPicture(i_timg); - JUT_ASSERT(1169, mpSpotTexture != 0); + JUT_ASSERT(1169, mpSpotTexture != NULL); } } |
