mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-12 04:57:06 -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.h"
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/d_bright_check.h"
|
||||
#include "JSystem/J2DGraph/J2DScreen.h"
|
||||
@@ -15,7 +15,7 @@
|
||||
dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) {
|
||||
mArchive = i_archive;
|
||||
mBrightCheck.mMsgString = new dMsgString_c();
|
||||
JUT_ASSERT(0, mBrightCheck.mMsgString != 0);
|
||||
JUT_ASSERT(0, mBrightCheck.mMsgString != NULL);
|
||||
|
||||
screenSet();
|
||||
mCompleteCheck = false;
|
||||
@@ -61,7 +61,7 @@ void dBrightCheck_c::screenSet() {
|
||||
#endif
|
||||
|
||||
mBrightCheck.Scr = new J2DScreen();
|
||||
JUT_ASSERT(0, mBrightCheck.Scr != 0);
|
||||
JUT_ASSERT(0, mBrightCheck.Scr != NULL);
|
||||
mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
|
||||
|
||||
mBrightCheck.Scr->search('g_abtn_n')->hide();
|
||||
|
||||
Reference in New Issue
Block a user