mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-24 15:00:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_meter_string.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
* UI Mini-Game Text
*/
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_meter_string.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -50,7 +50,7 @@ int dMeterString_c::_create() {
}
mpScreen = new J2DScreen();
JUT_ASSERT(0, mpScreen != 0);
JUT_ASSERT(0, mpScreen != NULL);
bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive);
JUT_ASSERT(0, fg != false);
@@ -61,13 +61,13 @@ int dMeterString_c::_create() {
JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive));
mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL);
JUT_ASSERT(0, mpParentPane != 0);
JUT_ASSERT(0, mpParentPane != NULL);
mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL);
JUT_ASSERT(0, mpRootPane != 0);
JUT_ASSERT(0, mpRootPane != NULL);
mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL);
JUT_ASSERT(0, mpTextPane != 0);
JUT_ASSERT(0, mpTextPane != NULL);
static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont());