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_lib.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_lib.cpp')
| -rw-r--r-- | src/d/d_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index a88d3f67a4..74d9181b05 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -3,7 +3,7 @@ * Utility Functions */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_lib.h" #include "d/d_event.h" @@ -255,7 +255,7 @@ BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz c * dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc */ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const* param_2) { u8 header[32] __attribute__((aligned(32))); - JUT_ASSERT(1252, i_aramArchive != 0); + JUT_ASSERT(1252, i_aramArchive != NULL); u32 address = i_aramArchive->getAramAddress(param_2); if (address == 0) { return 0; @@ -264,7 +264,7 @@ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const* 0, 0, 0xffffffff, 0); JUT_ASSERT(1260, readAddress == header); JKRArchive::SDIFileEntry* entry = i_aramArchive->findFsResource(param_2, 0); - JUT_ASSERT(1263, entry != 0); + JUT_ASSERT(1263, entry != NULL); u32 uVar1 = ALIGN_NEXT(JKRDecompExpandSize(header), 32); u32 uVar5 = ALIGN_NEXT(entry->data_size, 32); if (uVar1 > uVar5) { |