mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 08:51:29 -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_name.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
// Translation Unit: d/d_name
//
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_name.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
@@ -926,7 +926,7 @@ void dName_c::screenSet() {
};
nameIn.NameInScr = new J2DScreen();
JUT_ASSERT(0, nameIn.NameInScr != 0);
JUT_ASSERT(0, nameIn.NameInScr != NULL);
archive = dComIfGp_getNameResArchive();
nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive);
@@ -934,12 +934,12 @@ void dName_c::screenSet() {
nameIn.field_0x10 = nameIn.NameInScr->search('name_n');
void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive);
JUT_ASSERT(0, bpk != 0);
JUT_ASSERT(0, bpk != NULL);
mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk);
mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr);
void* btk = JKRGetNameResource("zelda_player_name.btk", archive);
JUT_ASSERT(0, btk != 0);
JUT_ASSERT(0, btk != NULL);
mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk);
mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr);
@@ -1013,7 +1013,7 @@ void dName_c::screenSet() {
mCharRow = 0;
mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL);
JUT_ASSERT(0, mSelIcon != 0);
JUT_ASSERT(0, mSelIcon != NULL);
mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f);
Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);