mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-12 13:04:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_grz matching (#2664)

Browse Source 
* initial work

* Over half done

* equivalent

* not sure what the issue is?

* matching

* PR cleanup
This commit is contained in:
Carco_21
2025-09-19 11:48:19 -07:00
committed by GitHub
parent 64eb771dd7
commit 933cc63185
9 changed files with 2628 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_grc.cpp
+5 -1
View File
@@ -148,6 +148,10 @@ enum Type {
/* 0x6 */ TYPE_6,
};
enum Event_Cut_Nums {
/* 0x1 */ NUM_EVT_CUTS_e = 0x1,
};
/* 809CFBB4-809CFBB8 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daNpc_grC_Param_c l_HIO;
@@ -1136,7 +1140,7 @@ BOOL daNpc_grC_c::doEvent() {
mStaffID = staffId;
int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0);
JUT_ASSERT(1774, (0 <= evtCutNo) && (evtCutNo < dEvent_manager_c::NUM_EVT_CUTS_e));
JUT_ASSERT(1774, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
JUT_ASSERT(1775, 0 != mEvtCutList[evtCutNo]);
if ((this->*mEvtCutList[evtCutNo])(staffId)) {
src/d/actor/d_a_npc_grr.cpp
+5 -1
View File
@@ -116,6 +116,10 @@ enum Type {
/* 0x3 */ TYPE_3
};
enum Event_Cut_Nums {
/* 0x1 */ NUM_EVT_CUTS_e = 0x1,
};
/* 809E3F44-809E3F48 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daNpc_grR_Param_c l_HIO;
@@ -1117,7 +1121,7 @@ BOOL daNpc_grR_c::doEvent() {
mStaffID = staffId;
int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0);
JUT_ASSERT(1771, (0 <= evtCutNo) && (evtCutNo < dEvent_manager_c::NUM_EVT_CUTS_e));
JUT_ASSERT(1771, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
JUT_ASSERT(1772, 0 != mEvtCutList[evtCutNo]);
if ((this->*mEvtCutList[evtCutNo])(staffId)) {
src/d/actor/d_a_npc_grz.cpp
+2510 -2506
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_zrc.cpp
+4 -4
View File
@@ -10,6 +10,10 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "Z2AudioLib/Z2Instances.h"
enum Event_Cut_Nums {
/* 0x2 */ NUM_EVT_CUTS_e = 0x2,
};
/* 80B93C5C-80B93C60 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daNpc_zrC_Param_c l_HIO;
@@ -193,10 +197,6 @@ daNpc_zrC_c::EventFn daNpc_zrC_c::mEvtCutList[2] = {
&daNpc_zrC_c::ECut_earringGet,
};
enum Event_Cut_Nums {
/* 0x2 */ NUM_EVT_CUTS_e = 0x2,
};
/* 80B8DC0C-80B8DD90 0000EC 0184+00 1/1 0/0 0/0 .text __ct__11daNpc_zrC_cFv */
daNpc_zrC_c::daNpc_zrC_c() {
// NONMATCHING