mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-17 23:01:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_event cleanup

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-01-06 12:18:37 -08:00
parent b27458c909
commit ae731fa8ad
9 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_agb.cpp
+2 -2
View File
@@ -80,7 +80,7 @@ int dMsgCtrl_c::execute() {
} else {
if (mpMsg->mMode == 18) {
mpMsg->mMode = 19;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
}
return mpMsg->mMode;
@@ -415,7 +415,7 @@ void daAgb_c::modeLookAttention() {
}
if (dComIfGp_evmng_endCheck("DEFAULT_AGB_LOOK_ATTENTION")) {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
mMode = 0;
se_flag = false;
src/d/actor/d_a_npc_kamome.cpp
+1 -1
View File
@@ -989,7 +989,7 @@ BOOL daNpc_kam_c::eventProc() {
/* 000034A8-00003514 .text eventEnd__11daNpc_kam_cFv */
void daNpc_kam_c::eventEnd() {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
offEventAccept();
if (mCurrEventIdxIdx == 0) { // "OPTION_CHAR_END"
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ void daObjBarrier_c::break_order_proc() {
/* 00000A58-00000AB8 .text break_end_wait_proc__14daObjBarrier_cFv */
void daObjBarrier_c::break_end_wait_proc() {
if (dComIfGp_evmng_endCheck(mEventID)) {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
fopAcM_delete(this);
}
}
src/d/actor/d_a_obj_mknjd.cpp
+2 -2
View File
@@ -552,7 +552,7 @@ void daObjMknjD::Act_c::privateCut() {
doCutEnd = true;
}
else {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
}
break;
default:
@@ -838,7 +838,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
if (dComIfGp_evmng_endCheck(mDemoEventIdx)) {
dComIfGp_getAttention().mFlags &= ~0x80000000;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
fopAcM_delete(this);
}
src/d/actor/d_a_obj_toripost.cpp
+4 -4
View File
@@ -690,7 +690,7 @@ void daObjTpost_c::modeTalk() {
modeProc(PROC_INIT, 0);
}
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
field_0x8F4 = 0;
}
}
@@ -747,7 +747,7 @@ void daObjTpost_c::modeTalkXY() {
if (stopped) {
if(cLib_calcTimer(&field_0x8DC) == 0 && talk(1) == dNpcMsgStts_BOX_CLOSED_e) {
modeProc(PROC_INIT, 0);
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
field_0x8F5 = 0;
}
}
@@ -755,7 +755,7 @@ void daObjTpost_c::modeTalkXY() {
}
void daObjTpost_c::modeReceiveInit() {
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
field_0x8F7 = 3;
setAnm(1, false);
}
@@ -772,7 +772,7 @@ void daObjTpost_c::modeReceiveDemo() {
if(dComIfGp_evmng_endCheck("DEFAULT_POST")) {
dLetter_read(m_letter[mNumReadable].mEventReg);
mNumReadable = getReadableLetterNum();
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
if(mNumReadable != 0) {
modeProc(PROC_INIT, 1);
src/d/actor/d_a_swhit0.cpp
+1 -1
View File
@@ -305,7 +305,7 @@ s32 daSwhit0_c::actionToOnOrder() {
s32 daSwhit0_c::actionToOnDemo() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
mState = 4;
dComIfGp_event_onEventFlag(0x08);
dComIfGp_event_reset();
return TRUE;
}
src/d/actor/d_a_tag_msg.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
}
if (l_msg != NULL && l_msg->mMode == 0x12) {
l_msg->mMode = 0x13;
dComIfGp_event_onEventFlag(8);
dComIfGp_event_reset();
if (a_this->getMessage() == 0x1902) {
daPy_getPlayerLinkActorClass()->offPlayerNoDraw();
}
src/d/actor/d_a_tbox.cpp
+1 -1
View File
@@ -995,7 +995,7 @@ BOOL daTbox_c::actionDemo() {
BOOL daTbox_c::actionDemo2() {
if (dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) {
setAction(&daTbox_c::actionOpenWait);
dComIfGp_event_onEventFlag(0x08);
dComIfGp_event_reset();
}
else {
demoProc();
src/d/d_event.cpp
+12 -13
View File
@@ -350,7 +350,7 @@ BOOL dEvt_control_c::itemCheck(dEvt_order_c* order) {
/* 80070D1C-80070DD4 .text endProc__14dEvt_control_cFv */
BOOL dEvt_control_c::endProc() {
switch (mMode) {
switch (getMode()) {
case dEvtMode_TALK_e:
talkEnd();
break;
@@ -475,7 +475,7 @@ BOOL dEvt_control_c::checkStart() {
/* 80071020-80071048 .text soundProc__14dEvt_control_cFv */
BOOL dEvt_control_c::soundProc() {
if (mEventEndSound != 0 && mMode != dEvtMode_DEMO_e)
if (mEventEndSound != 0 && getMode() != dEvtMode_DEMO_e)
mEventEndSound = 0;
return TRUE;
}
@@ -521,21 +521,21 @@ BOOL dEvt_control_c::photoCheck() {
s32 dEvt_control_c::moveApproval(void* actor) {
/* Nonmatching */
fopAc_ac_c* i_ac = (fopAc_ac_c*)actor;
if (mMode == 0)
if (getMode() == dEvtMode_NONE_e)
return dEvtMove_MOVE_e;
switch (mMode) {
case 1:
switch (getMode()) {
case dEvtMode_TALK_e:
if (convPId(mPt1) == i_ac || convPId(mPt2) == i_ac)
return dEvtMove_FORCE_e;
break;
case 2:
case dEvtMode_DEMO_e:
if (convPId(mPt1) == i_ac || convPId(mPt2) == i_ac)
return dEvtMove_FORCE_e;
if (i_ac->mDemoActorId != 0)
return dEvtMove_FORCE_e;
break;
case 3:
case dEvtMode_COMPULSORY_e:
if (convPId(mPt1) == i_ac)
return dEvtMove_FORCE_e;
break;
@@ -544,7 +544,7 @@ s32 dEvt_control_c::moveApproval(void* actor) {
if (fopAcM_checkStatus(i_ac, fopAcStts_FORCEMOVE_e))
return dEvtMove_FORCE_e;
if (mMode == 1 && fopAcM_checkStatus(i_ac, fopAcStts_UNK40_e))
if (getMode() == dEvtMode_TALK_e && fopAcM_checkStatus(i_ac, fopAcStts_UNK40_e))
return dEvtMove_MOVE_e;
if (dComIfGp_demo_mode() == 1)
return dEvtMove_MOVE_e;
@@ -561,7 +561,7 @@ s32 dEvt_control_c::moveApproval(void* actor) {
/* 80071418-80071468 .text compulsory__14dEvt_control_cFPvPCcUs */
BOOL dEvt_control_c::compulsory(void* actor, const char* eventName, u16 p3) {
if (mMode != 0)
if (getMode() != 0)
return FALSE;
return orderOld(dEvtType_COMPULSORY_e, 1, 0, p3, actor, NULL, eventName);
@@ -569,7 +569,7 @@ BOOL dEvt_control_c::compulsory(void* actor, const char* eventName, u16 p3) {
/* 80071468-800714AC .text remove__14dEvt_control_cFv */
void dEvt_control_c::remove() {
mMode = 0;
mMode = dEvtMode_NONE_e;
mbEndProc = 0;
mOrderCount = 0;
field_0xdd = 0;
@@ -587,7 +587,7 @@ void dEvt_control_c::remove() {
/* 800714AC-80071534 .text getStageEventDt__14dEvt_control_cFv */
dStage_Event_dt_c* dEvt_control_c::getStageEventDt() {
dStage_EventInfo_c* stageEventInfo = dComIfGp_getStageEventInfo();
if (mMode == 0)
if (getMode() == 0)
return NULL;
if (stageEventInfo == NULL || mEventInfoIdx == 0xFF || mEventInfoIdx >= stageEventInfo->num)
@@ -663,12 +663,11 @@ char* dEvt_info_c::getEventName() {
/* 800716F8-80071778 .text giveItemCut__14dEvt_control_cFUc */
bool dEvt_control_c::giveItemCut(u8 item) {
/* Nonmatching */
s32 staffIdx = dComIfGp_evmng_getMyStaffId("GIVEMAN");
if (staffIdx == -1)
return false;
dComIfGp_evmng_cutEnd(staffIdx);
mGetItemNo = staffIdx;
mGetItemNo = item;
return true;
}