mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-04 10:26:16 -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_talk.cpp
+21 -21
View File
@@ -2,7 +2,7 @@
// Translation Unit: msg/scrn/d_msg_scrn_talk
//
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_msg_scrn_talk.h"
#include "d/d_msg_scrn_light.h"
@@ -28,13 +28,13 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
}
init();
mpScreen = new J2DScreen();
JUT_ASSERT(70, mpScreen != 0);
JUT_ASSERT(70, mpScreen != NULL);
bool fg = mpScreen->setPriority("zelda_message_window_new.blo", 0x20000,
dComIfGp_getMsgArchive(1));
JUT_ASSERT(77, fg != false);
dPaneClass_showNullPane(mpScreen);
mpTxScreen = new J2DScreen();
JUT_ASSERT(81, mpTxScreen != 0);
JUT_ASSERT(81, mpTxScreen != NULL);
if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) {
fg = mpTxScreen->setPriority("zelda_message_window_text_seirei.blo", 0x20000,
dComIfGp_getMsgCommonArchive());
@@ -45,10 +45,10 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
JUT_ASSERT(90, fg != false);
dPaneClass_showNullPane(mpTxScreen);
mpArrow_c = new dMsgScrnArrow_c();
JUT_ASSERT(95, mpArrow_c != 0);
JUT_ASSERT(95, mpArrow_c != NULL);
if (dComIfGp_isHeapLockFlag() != 3) {
mpSelect_c = new dMsgScrn3Select_c();
JUT_ASSERT(100, mpSelect_c != 0);
JUT_ASSERT(100, mpSelect_c != NULL);
} else {
mpSelect_c = NULL;
}
@@ -69,9 +69,9 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
}
mpLight_c = new dMsgScrnLight_c(uVar22, param_2);
JUT_ASSERT(123, mpLight_c != 0);
JUT_ASSERT(123, mpLight_c != NULL);
void* mpBuf = field_0xe4->alloc(0x106a, 0x20);
JUT_ASSERT(126, mpBuf != 0);
JUT_ASSERT(126, mpBuf != NULL);
memset(mpBuf, 0, 0x106a);
mCharInfoPtr = (CharInfo_c*)mpBuf;
for (int i = 0; i < 150; i++) {
@@ -89,11 +89,11 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
mpScreen->search('mg_null')->getBounds().i.x + g_MsgObject_HIO_c.mTextPosX,
mpScreen->search('mg_null')->getBounds().i.y + g_MsgObject_HIO_c.mTextPosY);
mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL);
JUT_ASSERT(147, mpArw_c != 0);
JUT_ASSERT(147, mpArw_c != NULL);
mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL);
JUT_ASSERT(150, mpMg_c[0] != 0);
JUT_ASSERT(150, mpMg_c[0] != NULL);
mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL);
JUT_ASSERT(153, mpMg_c[1] != 0);
JUT_ASSERT(153, mpMg_c[1] != NULL);
OSInitFastCast();
#if VERSION == VERSION_GCN_JPN
@@ -103,7 +103,7 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
#endif
fukiPosCalc(param_1);
mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL);
JUT_ASSERT(176, mpPmP_c != 0);
JUT_ASSERT(176, mpPmP_c != NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY);
#if VERSION == VERSION_GCN_JPN
@@ -132,13 +132,13 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) {
mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_s1', 0, NULL);
JUT_ASSERT(189, mpTm_c[2] != 0);
JUT_ASSERT(189, mpTm_c[2] != NULL);
mpTm_c[3] = new CPaneMgr(mpTxScreen, 't3_s2', 0, NULL);
JUT_ASSERT(191, mpTm_c[3] != 0);
JUT_ASSERT(191, mpTm_c[3] != NULL);
mpTm_c[4] = new CPaneMgr(mpTxScreen, 't3_s3', 0, NULL);
JUT_ASSERT(193, mpTm_c[4] != 0);
JUT_ASSERT(193, mpTm_c[4] != NULL);
mpTm_c[5] = new CPaneMgr(mpTxScreen, 't3_s4', 0, NULL);
JUT_ASSERT(193, mpTm_c[5] != 0);
JUT_ASSERT(193, mpTm_c[5] != NULL);
}
mpTxScreen->search('n_3line')->show();
@@ -147,19 +147,19 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
}
#else
mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL);
JUT_ASSERT(182, mpTm_c[0] != 0);
JUT_ASSERT(182, mpTm_c[0] != NULL);
mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL);
JUT_ASSERT(185, mpTm_c[1] != 0);
JUT_ASSERT(185, mpTm_c[1] != NULL);
if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) {
mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_s1', 0, NULL);
JUT_ASSERT(189, mpTm_c[2] != 0);
JUT_ASSERT(189, mpTm_c[2] != NULL);
mpTm_c[3] = new CPaneMgr(mpTxScreen, 't4_s2', 0, NULL);
JUT_ASSERT(191, mpTm_c[3] != 0);
JUT_ASSERT(191, mpTm_c[3] != NULL);
mpTm_c[4] = new CPaneMgr(mpTxScreen, 't4_s3', 0, NULL);
JUT_ASSERT(193, mpTm_c[4] != 0);
JUT_ASSERT(193, mpTm_c[4] != NULL);
mpTm_c[5] = new CPaneMgr(mpTxScreen, 't4_s4', 0, NULL);
JUT_ASSERT(193, mpTm_c[5] != 0);
JUT_ASSERT(193, mpTm_c[5] != NULL);
}
mpTxScreen->search('n_3line')->hide();