mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-03 18:06:02 -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_meter2_info.cpp
+7 -7
View File
@@ -1,4 +1,4 @@
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/JMessage/JMessage.h"
@@ -862,7 +862,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
}
const ResTIMG* img = i_pic1->changeTexture((ResTIMG*)i_texBuf1, 0);
JUT_ASSERT(1284, img != 0);
JUT_ASSERT(1284, img != NULL);
}
tex_num++;
@@ -876,7 +876,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
if (i_pic2 != NULL) {
set3rdColor(itemType, i_pic2);
const ResTIMG* img = i_pic2->changeTexture((ResTIMG*)i_texBuf2, 0);
JUT_ASSERT(1333, img != 0);
JUT_ASSERT(1333, img != NULL);
}
tex_num++;
@@ -888,7 +888,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
if (i_pic2 != NULL) {
set2ndColor(itemType, i_pic2);
const ResTIMG* img = i_pic2->changeTexture((ResTIMG*)i_texBuf2, 0);
JUT_ASSERT(1348, img != 0);
JUT_ASSERT(1348, img != NULL);
}
tex_num++;
@@ -901,7 +901,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
if (i_pic3 != NULL) {
set3rdColor(itemType, i_pic3);
const ResTIMG* img = i_pic3->changeTexture((ResTIMG*)i_texBuf3, 0);
JUT_ASSERT(1364, img != 0);
JUT_ASSERT(1364, img != NULL);
}
tex_num++;
@@ -914,7 +914,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
if (i_pic4 != NULL) {
set4thColor(itemType, i_pic4);
const ResTIMG* img = i_pic4->changeTexture((ResTIMG*)i_texBuf4, 0);
JUT_ASSERT(1380, img != 0);
JUT_ASSERT(1380, img != NULL);
}
tex_num++;
@@ -1699,7 +1699,7 @@ int dMeter2Info_recieveLetter() {
OS_REPORT("letter info =====> %d, %d\n", j, dComIfGs_getGetNumber(j) - 1);
}
JUT_ASSERT(3552, 0);
JUT_ASSERT(3552, FALSE);
}
letterNum++;