mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -04:00
Fix JUT_ASSERT and several other macros (#2711)
* 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:
@@ -3,7 +3,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h"
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_kamakiri.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
@@ -64,10 +64,10 @@ int daObjKAM_c::CreateHeap() {
|
||||
J3DModelData* modelData;
|
||||
if (mSex == SEX_FEMALE) {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10);
|
||||
JUT_ASSERT(0xff, modelData != 0);
|
||||
JUT_ASSERT(0xff, modelData != NULL);
|
||||
} else {
|
||||
modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10);
|
||||
JUT_ASSERT(0x103, modelData != 0);
|
||||
JUT_ASSERT(0x103, modelData != NULL);
|
||||
}
|
||||
mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("I_Kam", 7), 2, 1.0f, 0,
|
||||
|
||||
Reference in New Issue
Block a user