mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-30 18:01:53 -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_msg_scrn_jimaku.cpp
+7 -7
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_msg_scrn_jimaku.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
@@ -25,7 +25,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
init();
mpScreen = new J2DScreen();
JUT_ASSERT(0, mpScreen != 0);
JUT_ASSERT(0, mpScreen != NULL);
bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000,
dComIfGp_getMsgCommonArchive());
@@ -33,15 +33,15 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
dPaneClass_showNullPane(mpScreen);
mpLight_c = new dMsgScrnLight_c(0, param_0);
JUT_ASSERT(0, mpLight_c != 0);
JUT_ASSERT(0, mpLight_c != NULL);
void* mpBuf = heap->alloc(0x106A, 0x20);
JUT_ASSERT(0, mpBuf != 0);
JUT_ASSERT(0, mpBuf != NULL);
memset(mpBuf, 0, 0x106A);
mCharInfoPtr = (CharInfo_c*)mpBuf;
mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL);
JUT_ASSERT(0, mpPmP_c != 0);
JUT_ASSERT(0, mpPmP_c != NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY);
field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5];
mpPmP_c->paneTrans(0.0f, field_0xcc);
@@ -67,10 +67,10 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
}
#else
mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL);
JUT_ASSERT(0, mpTm_c[0] != 0);
JUT_ASSERT(0, mpTm_c[0] != NULL);
mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL);
JUT_ASSERT(0, mpTm_c[1] != 0);
JUT_ASSERT(0, mpTm_c[1] != NULL);
mpScreen->search('n_3line')->hide();
mpScreen->search('n_3fline')->hide();