mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-17 23:21:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

npc_wrestler dbg work (#2795)

Browse Source
This commit is contained in:
YunataSavior
2025-11-10 19:52:59 -08:00
committed by GitHub
parent 23a1c94063
commit 70272b88f5
9 changed files with 590 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_chat.cpp
+2 -4
View File
@@ -3950,7 +3950,7 @@ bool daNpcChat_c::wait(void* param_1) {
if (
dKy_darkworld_check() == 0 && daPy_py_c::checkNowWolf() &&
fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0, 2.0) || mFear
fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0f, 2.0f) || mFear
) {
setAction(&daNpcChat_c::fear);
if (!mFear) {
@@ -3988,8 +3988,7 @@ bool daNpcChat_c::wait(void* param_1) {
setMotion(i_motion, -1.0f, 1);
}
if (mTalkFlag) {
if (dComIfGp_event_getTalkPartner() != this) {
if (mTalkFlag && dComIfGp_event_getTalkPartner() != this) {
if (field_0xe51 == 1) {
setMotion(MOT_SITWAIT_A, -1.0f, 0);
} else if (field_0xe51 == 2) {
@@ -3997,7 +3996,6 @@ bool daNpcChat_c::wait(void* param_1) {
} else {
setMotion(MOT_WAIT_A, -1.0f, 0);
}
}
}
} else if (mTalkFlag) {
mMode = 0;
src/d/actor/d_a_npc_wrestler.cpp
+485 -236
View File
File diff suppressed because it is too large Load Diff