mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-29 01:30:50 -04:00
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:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_balloon_2D.h"
|
||||
#include "JSystem/J2DGraph/J2DGrafContext.h"
|
||||
@@ -163,7 +163,7 @@ int daBalloon2D_c::createHeap() {
|
||||
return 0;
|
||||
}
|
||||
dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName);
|
||||
JUT_ASSERT(445, resInfo != 0);
|
||||
JUT_ASSERT(445, resInfo != NULL);
|
||||
JKRArchive* arc = resInfo->getArchive();
|
||||
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
|
||||
dPaneClass_showNullPane(mScreen);
|
||||
@@ -243,7 +243,7 @@ int daBalloon2D_c::create() {
|
||||
if (!fopAcM_entrySolidHeap(this, daBalloon2D_createHeap, 0)) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
JUT_ASSERT(566, daBalloon2D_c::myclass == 0);
|
||||
JUT_ASSERT(566, daBalloon2D_c::myclass == NULL);
|
||||
myclass = this;
|
||||
setHIO(true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user