mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-13 05:16:01 -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/actor/d_a_e_kk.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_e_kk.h"
#include "d/actor/d_a_player.h"
@@ -404,7 +404,7 @@ bool daE_KK_c::way_gake_check() {
gndChk.SetPos(&field_0x6d4[i]);
field_0x6d4[i].y = dComIfG_Bgsp().GroundCross(&gndChk);
if (field_0x6d4[i].y == -1000000000.0f) {
if (field_0x6d4[i].y == -G_CM3D_F_INF) {
field_0x6d4[i].y = current.pos.y;
return true;
}
@@ -1166,7 +1166,7 @@ void daE_KK_c::action() {
position.y += 300.0f;
gndChk.SetPos(&position);
position.y = dComIfG_Bgsp().GroundCross(&gndChk);
if (position.y == -1000000000.0f) {
if (position.y == -G_CM3D_F_INF) {
mTimer = 100;
setActionMode(10, 2);
} else {
@@ -1362,7 +1362,7 @@ static int daE_KK_Delete(daE_KK_c* i_this) {
int daE_KK_c::CreateHeap() {
if (field_0x679 != 1) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x22);
JUT_ASSERT(2212, modelData != 0);
JUT_ASSERT(2212, modelData != NULL);
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x19), 0,
@@ -1380,7 +1380,7 @@ int daE_KK_c::CreateHeap() {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x23);
JUT_ASSERT(2247, modelData != 0);
JUT_ASSERT(2247, modelData != NULL);
mpWeaponMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x1D), 0,