mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-01 18:28:56 -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_npc_zrc.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
@@ -1196,7 +1196,7 @@ BOOL daNpc_zrC_c::doEvent() {
|
||||
mStaffID = staff_id;
|
||||
int evtCutNo = event_mgr->getMyActIdx(staff_id, mEvtCutNameList, 2, 0, 0);
|
||||
JUT_ASSERT(0x8ca, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
|
||||
JUT_ASSERT(0x8cb, 0 != mEvtCutList[evtCutNo]);
|
||||
JUT_ASSERT(0x8cb, NULL != mEvtCutList[evtCutNo]);
|
||||
if ((this->*mEvtCutList[evtCutNo])(staff_id)) {
|
||||
event_mgr->cutEnd(staff_id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user