mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use FALSE macro in asserts, remove JUT_PANIC macro

Browse Source
This commit is contained in:
LagoLunatic
2024-06-22 10:10:07 -04:00
parent d419a25be3
commit c836c5ca1f
26 changed files with 104 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_event.cpp
+11 -11
View File
@@ -41,7 +41,7 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 hindFlag, v
pNewOrder->mEventInfoIdx = eventInfoIdx;
if (pNewOrder->mPriority == 0)
JUT_ASSERT(0x93, 0);
JUT_ASSERT(0x93, FALSE);
if (mOrderCount == 0) {
mFirstOrderIdx = 0;
@@ -143,7 +143,7 @@ BOOL dEvt_control_c::talkCheck(dEvt_order_c* order) {
}
if (!dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x145, 0);
JUT_ASSERT(0x145, FALSE);
return TRUE;
} else {
@@ -203,7 +203,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
}
if (!dComIfGp_evmng_order(mEventId)) {
JUT_ASSERT(401, 0);
JUT_ASSERT(401, FALSE);
}
return TRUE;
}
@@ -231,7 +231,7 @@ BOOL dEvt_control_c::photoCheck(dEvt_order_c* order) {
}
if (!dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x1b5, 0);
JUT_ASSERT(0x1b5, FALSE);
mbInPhoto = 1;
mMode = dEvtMode_TALK_e;
@@ -258,7 +258,7 @@ BOOL dEvt_control_c::catchCheck(dEvt_order_c* order) {
mItemNo = dComIfGp_att_getCatchChgItem();
mMode = dEvtMode_DEMO_e;
if (mEventId != -1 && !dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x1e3, 0);
JUT_ASSERT(0x1e3, FALSE);
onEventFlag(0x80);
return TRUE;
}
@@ -288,7 +288,7 @@ BOOL dEvt_control_c::demoCheck(dEvt_order_c* order) {
s16 eventId = order->mEventId;
if (actor2 == NULL) {
JUT_ASSERT(0x21f, 0);
JUT_ASSERT(0x21f, FALSE);
return FALSE;
}
@@ -336,7 +336,7 @@ BOOL dEvt_control_c::potentialCheck(dEvt_order_c* order) {
fopAc_ac_c* actor1 = order->mActor1;
fopAc_ac_c* actor2 = order->mActor2;
if (actor1 == NULL || actor2 == NULL)
JUT_ASSERT(0x280, 0);
JUT_ASSERT(0x280, FALSE);
if (!beforeFlagProc(order))
return FALSE;
@@ -357,7 +357,7 @@ BOOL dEvt_control_c::doorCheck(dEvt_order_c* order) {
mEventId = actor2->eventInfo.getEventId();
if (mEventId != -1 && dComIfGp_getPEvtManager()->getEventData(mEventId) != NULL) {
if (!dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x2c0, 0);
JUT_ASSERT(0x2c0, FALSE);
} else {
mEventId = -1;
reset();
@@ -379,7 +379,7 @@ BOOL dEvt_control_c::itemCheck(dEvt_order_c* order) {
mMode = dEvtMode_DEMO_e;
mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
if (!dComIfGp_evmng_order(mEventId))
JUT_ASSERT(0x2ea, 0);
JUT_ASSERT(0x2ea, FALSE);
return TRUE;
} else {
return FALSE;
@@ -398,7 +398,7 @@ BOOL dEvt_control_c::endProc() {
case dEvtMode_COMPULSORY_e:
break;
default:
JUT_ASSERT(0x315, 0);
JUT_ASSERT(0x315, FALSE);
}
mMode = dEvtMode_NONE_e;
@@ -506,7 +506,7 @@ BOOL dEvt_control_c::checkStart() {
case dEvtType_CHANGE_e:
break;
default:
JUT_ASSERT(0x39c, 0);
JUT_ASSERT(0x39c, FALSE);
break;
}