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_save.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_save.cpp')
| -rw-r--r-- | src/d/d_save.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index a212cfa91b..d2465d8967 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -3,7 +3,7 @@ * Save File Manager */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JUtility/JUTGamePad.h" @@ -401,7 +401,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { } // Uncertain combination item＝＝＝＞%d, %d\n OSReport_Error("合成アイテム不定＝＝＝＞%d, %d\n", select_item, mix_item); - JUT_ASSERT(731, 0); + JUT_ASSERT(731, FALSE); } } } @@ -1729,7 +1729,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { if (!((0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255)) { OS_REPORT("i_no = %d\n", i_no); - JUT_ASSERT(4302, 0); + JUT_ASSERT(4302, FALSE); } if (i_no == -1 || i_no == 255) { |