mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-30 16:35:26 -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/d_event.cpp
+10 -10
View File
@@ -1,4 +1,4 @@
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_event.h"
#include "d/actor/d_a_alink.h"
@@ -277,7 +277,7 @@ int dEvt_control_c::talkCheck(dEvt_order_c* order) {
if (!dComIfGp_getEventManager().order(mEventId)) {
// "specified event %d not ordered!!"
OS_REPORT("指定イベント %d が無い!!\n", mEventId);
JUT_ASSERT(429, 0);
JUT_ASSERT(429, FALSE);
}
return 1;
@@ -343,7 +343,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
if (!dComIfGp_getEventManager().order(mEventId)) {
// "specified event %d not ordered!!"
OS_REPORT("指定イベント %d が無い!!\n", mEventId);
JUT_ASSERT(512, 0);
JUT_ASSERT(512, FALSE);
}
return 1;
}
@@ -374,7 +374,7 @@ int dEvt_control_c::catchCheck(dEvt_order_c* order) {
if (!dComIfGp_getEventManager().order(mEventId)) {
// "specified event %d not ordered!!"
OS_REPORT("指定イベント %d が無い!!\n", mEventId);
JUT_ASSERT(551, 0);
JUT_ASSERT(551, FALSE);
}
}
@@ -414,7 +414,7 @@ int dEvt_control_c::demoCheck(dEvt_order_c* order) {
int eventId = order->mEventId;
if (actor2 == NULL) {
JUT_ASSERT(608, 0);
JUT_ASSERT(608, FALSE);
return 0;
}
@@ -481,7 +481,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* order) {
#if DEBUG
if (actor1 == NULL || actor2 == NULL) {
JUT_ASSERT(704, 0);
JUT_ASSERT(704, FALSE);
}
#endif
@@ -536,7 +536,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* order) {
if (mEventId != -1 && dComIfGp_getEventManager().getEventData(mEventId) != NULL) {
if (!dComIfGp_getEventManager().order(mEventId)) {
JUT_ASSERT(773, 0);
JUT_ASSERT(773, FALSE);
}
} else {
mEventId = -1;
@@ -572,7 +572,7 @@ int dEvt_control_c::itemCheck(dEvt_order_c* order) {
if (!dComIfGp_getEventManager().order(mEventId)) {
// "specified event %d not ordered!!"
OS_REPORT("指定イベント %s が無い!!\n", eventname);
JUT_ASSERT(817, 0);
JUT_ASSERT(817, FALSE);
}
return 1;
}
@@ -596,7 +596,7 @@ int dEvt_control_c::endProc() {
demoEnd();
break;
case dEvt_mode_COMPULSORY_e:
JUT_ASSERT(858, 0);
JUT_ASSERT(858, FALSE);
}
mMode = dEvt_mode_WAIT_e;
@@ -699,7 +699,7 @@ int dEvt_control_c::entry() {
}
break;
case 12:
JUT_ASSERT(980, 0);
JUT_ASSERT(980, FALSE);
break;
case 13:
break;