mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve all gameInfo fakematches (#2995)

Browse Source 
* 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
This commit is contained in:
LagoLunatic
2025-12-24 19:57:36 -05:00
committed by GitHub
parent cefe919b8d
commit 229527daf7
194 changed files with 767 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_moir.cpp
+3 -3
View File
@@ -1336,7 +1336,7 @@ bool daNpcMoiR_c::talk(void* param_1) {
if (field_0xdf8 != -1) {
s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF);
field_0x9ec = true;
}
@@ -1513,7 +1513,7 @@ bool daNpcMoiR_c::demo(void* param_1) {
field_0xe08 = 2;
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != 0 && eventInfo.checkCommandTalk() == 0) {
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == 0) {
evt_mng = &dComIfGp_getEventManager();
s32 staffIdx = evt_mng->getMyStaffId(l_myName, NULL, 0);
if (staffIdx != -1) {
@@ -1860,7 +1860,7 @@ BOOL daNpcMoiR_c::main() {
(this->*mAction)(NULL);
}
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) {
dComIfGp_event_setItemPartnerId(field_0xdf8);
field_0xdf8 = -1;
}