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

Miscellaneous match improvements (#2562)

Browse Source
This commit is contained in:
Max Roncace
2025-07-31 05:19:46 -04:00
committed by GitHub
parent 418e39356d
commit e0bbad1f3f
9 changed files with 215 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_zant.cpp
+6 -9
View File
@@ -8,12 +8,6 @@
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_counter.h"
/* 80B6ED28-80B6ED34 000008 000C+00 1/1 0/0 0/0 .bss @3811 */
static u8 lit_3811[12];
/* 80B6ED34-80B6ED38 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static u8 l_HIO[4];
UNK_REL_DATA
/* 80B6EAB4-80B6EABC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */
@@ -73,6 +67,9 @@ daNpc_Zant_c::cutFunc daNpc_Zant_c::mCutList[1] = {
NULL
};
/* 80B6ED34-80B6ED38 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daNpc_Zant_Param_c l_HIO;
/* 80B6C1AC-80B6C2D0 0000EC 0124+00 1/0 0/0 0/0 .text __dt__12daNpc_Zant_cFv */
daNpc_Zant_c::~daNpc_Zant_c() {
OS_REPORT("|%06d:%x|daNpc_Zant_c -> デストラクト\n", g_Counter.mCounter0, this);
@@ -444,7 +441,7 @@ void daNpc_Zant_c::drawGhost() {
/* 80B6D21C-80B6D264 00115C 0048+00 1/1 0/0 0/0 .text selectAction__12daNpc_Zant_cFv */
int daNpc_Zant_c::selectAction() {
field_0xf84 = NULL;
field_0xf84 = &daNpc_Zant_c::talk;
field_0xf84 = &daNpc_Zant_c::wait;
return 1;
}
@@ -487,7 +484,7 @@ int daNpc_Zant_c::wait(void* param_1) {
if (chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) {
mJntAnm.lookPlayer(0);
}
if (!srchPlayerActor() && home.angle.y == mCurAngle.y) {
mMode = 1;
}
@@ -534,7 +531,7 @@ int daNpc_Zant_c::talk(void* param_1) {
dComIfGp_event_reset();
mMode = 3;
}
mJntAnm.lookPlayer(0);
if (mTwilight) {
mJntAnm.lookNone(0);