mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc cleanup (#2466)

Browse Source 
* d_a_npc first cleanup pass

* more d_a_npc cleanup
This commit is contained in:
TakaRikka
2025-05-31 05:18:54 -07:00
committed by GitHub
parent 9c05870897
commit 49b1c20e24
12 changed files with 4035 additions and 3364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_uri.cpp
+8 -8
View File
@@ -443,7 +443,7 @@ void daNpc_Uri_c::reset() {
cStack_44 = mPath.getPntPos(1);
setPos(acStack_38);
cStack_a0.y = cLib_targetAngleY(&acStack_38, &cStack_44);
mPath.setNextIdx(mPath.mpRoomPath->m_num);
mPath.setNextIdx(mPath.mPathInfo->m_num);
}
if (daNpcT_chkEvtBit(0x20) != 0 || daNpcT_chkEvtBit(0x1e) != 0 ||
daNpcT_chkEvtBit(0x92) != 0)
@@ -955,7 +955,7 @@ int daNpc_Uri_c::getTutorialCond(cXyz param_1) {
cXyz local_50;
cXyz cStack_5c;
local_44 = mPath.getPntPos(mPath.mpRoomPath->m_num - 1);
local_44 = mPath.getPntPos(mPath.mPathInfo->m_num - 1);
if (local_44.absXZ(param_1) < daNpc_Uri_Param_c::m.field_0x98) {
return 9;
}
@@ -1137,7 +1137,7 @@ int daNpc_Uri_c::cutEndCarryTutorial(int param_1) {
break;
case 2:
initTalk(19, NULL);
mItemId = -1;
mItemPartnerId = fpcM_ERROR_PROCESS_ID_e;
}
}
@@ -1154,11 +1154,11 @@ int daNpc_Uri_c::cutEndCarryTutorial(int param_1) {
if (talkProc(NULL, 0, NULL, 0) && mFlow.checkEndFlow() &&
(s32)mFlow.getEventId(&local_48) == 1)
{
if (mItemId == fpcM_ERROR_PROCESS_ID_e) {
mItemId =
if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
mItemPartnerId =
fopAcM_createItemForPresentDemo(&current.pos, local_48, 0, -1, -1, NULL, NULL);
}
if (fopAcM_IsExecuting(mItemId)) {
if (fopAcM_IsExecuting(mItemPartnerId)) {
daNpcT_offTmpBit(7);
daNpcT_offTmpBit(10);
daNpcT_offTmpBit(0x20);
@@ -1385,7 +1385,7 @@ int daNpc_Uri_c::krun(void* param_0) {
mJntAnm.lookNone(0);
if (field_0xfec == 0) {
cXyz cStack_58;
int iVar2 = mPath.getDstPosH(current.pos, &cStack_58, mPath.mpRoomPath->m_num, 4);
int iVar2 = mPath.getDstPosH(current.pos, &cStack_58, mPath.mPathInfo->m_num, 4);
calcSpeedAndAngle(cStack_58, iVar2, 6, 0x800);
if (iVar2 != 0 && cM3d_IsZero(speedF)) {
@@ -1616,7 +1616,7 @@ int daNpc_Uri_c::walk(void* param_0) {
}
if (!mStagger.checkStagger()) {
cXyz cStack_84;
int iVar2 = mPath.getDstPosH(current.pos, &cStack_84, mPath.mpRoomPath->m_num, 4);
int iVar2 = mPath.getDstPosH(current.pos, &cStack_84, mPath.mPathInfo->m_num, 4);
if (iVar2) {
bVar = TRUE;
}