diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-24 19:57:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-24 16:57:36 -0800 |
| commit | 229527daf71c76965ef0735abca530cee68b7358 (patch) | |
| tree | 0325055c01866d359b1556a2cbc6b65cbd238466 /src/d/actor/d_a_npc_gro.cpp | |
| parent | cefe919b8d39cb5b60d79b1dc7452e80abdf9657 (diff) | |
Resolve all gameInfo fakematches (#2995)
* Clean up various inlines/fakematches/comments
* Copy OptRuby inline name from TWW debug
* Resolve all dEvt_control_c related fakematches, return pointer instead of reference
* Fix some more missing inline usages
Diffstat (limited to 'src/d/actor/d_a_npc_gro.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_gro.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 71e5f7367a..6dd71c0900 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -639,7 +639,7 @@ BOOL daNpc_grO_c::main() { attention_info.flags = 0; } - if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1289,7 +1289,7 @@ BOOL daNpc_grO_c::doEvent() { int evtCutNo = 0; BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mUnkFlag) { @@ -1672,7 +1672,7 @@ int daNpc_grO_c::talk(void* param_1) { mItemID = fopAcM_createItemForPresentDemo(¤t.pos, itemId, 0, -1, -1, NULL, NULL); if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); mUnkFlag = 1; field_0x9ec = true; @@ -1684,7 +1684,7 @@ int daNpc_grO_c::talk(void* param_1) { // dSv_event_tmp_flag_c::T_0081 - Kakariko Village - For use in fundraiser event completion cutscene daNpcF_chkTmpBit(81) ) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); field_0x9ec = true; mOrderNewEvt = true; mOrderEvtNo = EVT_BOKIN_FINISH; |