mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-25 08:02:04 -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_obj_oiltubo.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
* Lantern Oil Pot
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_oiltubo.h"
@@ -56,7 +56,7 @@ const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = {
/* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Oiltubo_cFv */
int daObj_Oiltubo_c::CreateHeap() {
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName);
JUT_ASSERT(0, mdlData_p != 0);
JUT_ASSERT(0, mdlData_p != NULL);
mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084);
if (mpModel == NULL) {
@@ -64,7 +64,7 @@ int daObj_Oiltubo_c::CreateHeap() {
}
J3DModelData* mdlBData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bbmdFileName);
JUT_ASSERT(0, mdlBData_p != 0);
JUT_ASSERT(0, mdlBData_p != NULL);
mpBModel = mDoExt_J3DModel__create(mdlBData_p, 0x80000, 0x19000284);
if (mpBModel == NULL) {
@@ -95,7 +95,7 @@ int daObj_Oiltubo_c::Execute() {
mGroundChk = mAcch.m_gnd;
mGroundHeight = mAcch.GetGroundH();
if (mGroundHeight != -1000000000.0f) {
if (mGroundHeight != -G_CM3D_F_INF) {
setEnvTevColor();
setRoomNo();
}