mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-11 20:48:21 -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_bullet.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bullet.h"
#include "d/d_com_inf_game.h"
@@ -58,7 +58,7 @@ int daBullet_c::create() {
/* 80655E5C-80655EDC 0005FC 0080+00 1/1 0/0 0/0 .text CreateHeap__10daBullet_cFv */
BOOL daBullet_c::CreateHeap() {
void* mdlData_p = dComIfG_getObjectRes(getResName(), getBmdName());
JUT_ASSERT(273, 0 != mdlData_p);
JUT_ASSERT(273, NULL != mdlData_p);
mpModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, 0x80000, 0x11000084);
return mpModel != NULL;
}
@@ -94,11 +94,11 @@ int daBullet_c::Execute() {
mGndChk = mAcch.m_gnd;
mGroundY = mAcch.GetGroundH();
} else {
mGroundY = -1000000000.0f;
mGroundY = -G_CM3D_F_INF;
}
int room_no;
if (mGroundY != -1000000000.0f) {
if (mGroundY != -G_CM3D_F_INF) {
room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
} else {