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/actor/d_a_obj_bmWindow.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/actor/d_a_obj_bmWindow.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_bmWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 7f2bece799..78d8b57d8e 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -2,7 +2,7 @@ // Bm Window // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bmWindow.h" #include "d/d_com_inf_game.h" @@ -43,7 +43,7 @@ void daBmWindow_c::setBaseMtx() { /* 80BB8400-80BB846C 0002E0 006C+00 1/0 0/0 0/0 .text CreateHeap__12daBmWindow_cFv */ int daBmWindow_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Window", 4); - JUT_ASSERT(285, modelData != 0); + JUT_ASSERT(285, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); return mModel != NULL ? 1 : 0; } |