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
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
+4 -4
View File
@@ -3,7 +3,7 @@
* Item (Rupee, Arrow, Heart, etc) Object Actor
*/
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_item.h"
#include "SSystem/SComponent/c_math.h"
@@ -288,7 +288,7 @@ int daItem_c::_daItem_create() {
{
// "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n"
OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo);
JUT_ASSERT(0, 0);
JUT_ASSERT(0, FALSE);
return cPhs_ERROR_e;
} else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 ||
m_itemNo == fpcNm_ITEM_BOMB_30)
@@ -1175,7 +1175,7 @@ void daItem_c::initFlag() {
default:
// "Item: Set Type<%d>\n"
OS_REPORT("アイテム:セットタイプ<%d>\n", type);
JUT_ASSERT(0, 0);
JUT_ASSERT(0, FALSE);
case TYPE_LAUNCH_e:
case TYPE_LAUNCH_SMALL_e:
case TYPE_LAUNCH_FROM_PLAYER_e:
@@ -1226,7 +1226,7 @@ void daItem_c::initScale() {
scale.setall(0.0f);
break;
default:
JUT_ASSERT(0, 0);
JUT_ASSERT(0, FALSE);
case TYPE_FIXED_PLACE_e:
case TYPE_WAIT_e:
case TYPE_SIMPLE_GET_e: