encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Sakuita rope Matching (#2470)

Browse Source 
* Change dComIfGp_getAttention to return a pointer

* d_a_obj_sakuita_rope Matching
This commit is contained in:
hatal175
2025-06-01 20:36:19 -07:00
committed by GitHub
parent 8e91607e55
commit 588b20679d
32 changed files with 558 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+1 -1
View File
@@ -4694,7 +4694,7 @@ int daAlink_c::create() {
return cPhs_ERROR_e;
}
mAttention = &dComIfGp_getAttention();
mAttention = dComIfGp_getAttention();
field_0x317c = dComIfGp_getPlayerCameraID(0);
playerInit();
src/d/actor/d_a_b_dr.cpp
+1 -1
View File
@@ -2327,7 +2327,7 @@ void daB_DR_c::executeBreathAttack() {
attention_info.flags &= ~0x4;
} else {
mWeekCc.OnTgSetBit();
if (mTarget != 0 || (dComIfGp_getAttention().GetLockonList(0) != NULL && dComIfGp_getAttention().LockonTruth() && dComIfGp_getAttention().GetLockonList(0)->getActor() == this)) {
if (mTarget != 0 || (dComIfGp_getAttention()->GetLockonList(0) != NULL && dComIfGp_getAttention()->LockonTruth() && dComIfGp_getAttention()->GetLockonList(0)->getActor() == this)) {
mTarget = 0;
} else {
attention_info.flags &= ~0x4;
src/d/actor/d_a_b_zant.cpp
+1 -1
View File
@@ -5411,7 +5411,7 @@ void daB_ZANT_c::cc_ice_set() {
cXyz sp40;
if (mAction == ACT_ICE_STEP || mAction == ACT_ICE_JUMP) {
if (!dComIfGp_getAttention().LockonTruth() || dComIfGp_getAttention().LockonTarget(0) != this) {
if (!dComIfGp_getAttention()->LockonTruth() || dComIfGp_getAttention()->LockonTarget(0) != this) {
mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_FOOT_L));
mDoMtx_stack_c::transM(20.0f, 0.0f, 0.0f);
mDoMtx_stack_c::multVecZero(&sp34);
src/d/actor/d_a_coach_fire.cpp
+3 -3
View File
@@ -121,9 +121,9 @@ int daCoachFire_c::execute() {
setNoHitTimer();
}
if (coach != NULL && coach->checkCoachBlazing()) {
dAttention_c& attn = dComIfGp_getAttention();
if (attn.LockonTruth()) {
if (attn.LockonTarget(0) != this) {
dAttention_c* attn = dComIfGp_getAttention();
if (attn->LockonTruth()) {
if (attn->LockonTarget(0) != this) {
if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) {
fopAcM_delete(this);
}
src/d/actor/d_a_cow.cpp
+2 -2
View File
@@ -1827,8 +1827,8 @@ void daCow_c::action_angry() {
}
int lockedOn = false;
if (mRunDuration && mForgetCowPTimer && dComIfGp_getAttention().LockonTruth() &&
(dComIfGp_getAttention().LockonTarget(0) == this) &&
if (mRunDuration && mForgetCowPTimer && dComIfGp_getAttention()->LockonTruth() &&
(dComIfGp_getAttention()->LockonTarget(0) == this) &&
(s16)cLib_distanceAngleS(playerAngle, mSavedAngle.y) < 0x800)
{
mTargetAngle = playerAngle;
src/d/actor/d_a_e_tk_ball.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ static void e_tk_ball_move(e_tk_ball_class* i_this) {
s8 actor_lockon = false;
fopAc_ac_c* parent_actor = fopAcM_SearchByID(actor->parentActorID);
if (parent_actor != NULL) {
dAttention_c* attention = &dComIfGp_getAttention();
dAttention_c* attention = dComIfGp_getAttention();
if (attention->Lockon() && parent_actor == attention->LockonTarget(0)) {
actor_lockon = true;
parent_actor->attention_info.flags |= 0x200000;
src/d/actor/d_a_e_ym.cpp
+3 -3
View File
@@ -348,9 +348,9 @@ u8 daE_YM_c::checkSurpriseLock() {
return 0;
}
if (mAction != 8) {
bool truth = dComIfGp_getAttention().LockonTruth();
bool truth = dComIfGp_getAttention()->LockonTruth();
if (truth) {
fopAc_ac_c* tgt = dComIfGp_getAttention().LockonTarget(0);
fopAc_ac_c* tgt = dComIfGp_getAttention()->LockonTarget(0);
if (tgt == this && mType == 0) {
cXyz my_vec_0 = current.pos - mPrevPos;
cXyz my_vec_1 = player->current.pos - mPrevPos;
@@ -1499,7 +1499,7 @@ void daE_YM_c::executeAttack() {
field_0x6a5 = 0;
break;
case 1:
if (field_0x6d4 && (dComIfGp_getAttention().LockonTruth() == 0 || dComIfGp_getAttention().LockonTarget(0) != this)) {
if (field_0x6d4 && (dComIfGp_getAttention()->LockonTruth() == 0 || dComIfGp_getAttention()->LockonTarget(0) != this)) {
if (checkSurpriseNear()) {
return;
}
src/d/actor/d_a_ep.cpp
+2 -2
View File
@@ -224,10 +224,10 @@ static void hahen_carry(ep_class* i_this, ep_hahen_s* hahen_s) {
hahen_s->field_0x28.x = 0;
hahen_s->field_0x28.z = 0x4000;
hahen_s->field_0x28.y = player->shape_angle.y;
if (dComIfGp_getAttention().Lockon()) {
if (dComIfGp_getAttention()->Lockon()) {
hahen_s->field_0x30 = 80.0f;
fopAc_ac_c* lockOnTarget = dComIfGp_getAttention().LockonTarget(0);
fopAc_ac_c* lockOnTarget = dComIfGp_getAttention()->LockonTarget(0);
if (lockOnTarget) {
cXyz local_34, cStack_28;
local_34 = lockOnTarget->current.pos - hahen_s->field_0x4;
src/d/actor/d_a_horse.cpp
+2 -2
View File
@@ -1942,7 +1942,7 @@ int daHorse_c::setSpeedAndAngle() {
}
if (checkStateFlg0(FLG0_UNK_1)) {
dAttention_c* attention = &dComIfGp_getAttention();
dAttention_c* attention = dComIfGp_getAttention();
if (attention->GetLockonList(0) != NULL && attention->LockonTruth() && fopAcM_searchActorDistanceXZ2(this, attention->GetLockonList(0)->getActor()) > 1000000.0f) {
cLib_addCalcAngleS(&current.angle.y, fopAcM_searchActorAngleY(this, attention->GetLockonList(0)->getActor()), 5, field_0x16c2, daHorse_hio_c0::m.min_turn);
if (!checkStateFlg0(daHorse_FLG0(FLG0_UNK_100000 | FLG0_UNK_200000))) {
@@ -3099,7 +3099,7 @@ BOOL daHorse_c::checkServiceWaitAnime() {
/* 80840844-808408F0 008A04 00AC+00 2/2 0/0 0/0 .text checkTurnInput__9daHorse_cFv */
BOOL daHorse_c::checkTurnInput() {
return m_padStickValue > 0.9f && (!dComIfGp_getAttention().Lockon() || daAlink_getAlinkActorClass()->getAtnActor() != NULL);
return m_padStickValue > 0.9f && (!dComIfGp_getAttention()->Lockon() || daAlink_getAlinkActorClass()->getAtnActor() != NULL);
}
/* 808408F0-808409C0 008AB0 00D0+00 2/2 0/0 0/0 .text checkTgHitTurn__9daHorse_cFv */
src/d/actor/d_a_hozelda.cpp
+1 -1
View File
@@ -481,7 +481,7 @@ void daHoZelda_c::setAnm() {
}
BOOL gnd_lockon;
if (dComIfGp_getAttention().GetLockonList(0) != NULL && dComIfGp_getAttention().LockonTruth() && dComIfGp_getAttention().GetLockonList(0)->getActor() == gnd_actor) {
if (dComIfGp_getAttention()->GetLockonList(0) != NULL && dComIfGp_getAttention()->LockonTruth() && dComIfGp_getAttention()->GetLockonList(0)->getActor() == gnd_actor) {
gnd_lockon = TRUE;
} else {
gnd_lockon = FALSE;
src/d/actor/d_a_npc.cpp
+21 -21
View File
@@ -2234,11 +2234,11 @@ BOOL daNpcT_c::chkFindActor(fopAc_ac_c* i_actor, BOOL i_release, s16 i_angleY) {
int dist_index = i_release == FALSE ? attention_info.distances[fopAc_attn_SPEAK_e]
: attention_info.distances[fopAc_attn_TALK_e];
f32 dist_max = i_release == FALSE ? dComIfGp_getAttention().getDistTable(dist_index).mDistMax
: dComIfGp_getAttention().getDistTable(dist_index).mDistMaxRelease;
f32 lower_y = dComIfGp_getAttention().getDistTable(dist_index).mLowerY * -1.0f;
f32 upper_y = dComIfGp_getAttention().getDistTable(dist_index).mUpperY * -1.0f;
u32 angle_select = dComIfGp_getAttention().getDistTable(dist_index).mAngleSelect;
f32 dist_max = i_release == FALSE ? dComIfGp_getAttention()->getDistTable(dist_index).mDistMax
: dComIfGp_getAttention()->getDistTable(dist_index).mDistMaxRelease;
f32 lower_y = dComIfGp_getAttention()->getDistTable(dist_index).mLowerY * -1.0f;
f32 upper_y = dComIfGp_getAttention()->getDistTable(dist_index).mUpperY * -1.0f;
u32 angle_select = dComIfGp_getAttention()->getDistTable(dist_index).mAngleSelect;
f32 fov = 180.0f;
if (angle_select & 8) {
@@ -2286,17 +2286,17 @@ BOOL daNpcT_c::chkFindWolf(s16 i_angleY, int i_distIndex, int param_2, f32 i_bou
return TRUE;
}
f32 dist_max = dComIfGp_getAttention().getDistTable(i_distIndex).mDistMax;
f32 upper_y = dComIfGp_getAttention().getDistTable(i_distIndex).mUpperY;
f32 lower_y = dComIfGp_getAttention().getDistTable(i_distIndex).mLowerY;
f32 dist_max = dComIfGp_getAttention()->getDistTable(i_distIndex).mDistMax;
f32 upper_y = dComIfGp_getAttention()->getDistTable(i_distIndex).mUpperY;
f32 lower_y = dComIfGp_getAttention()->getDistTable(i_distIndex).mLowerY;
if (chkPointInArea(attn_pos, attention_info.position, dist_max, upper_y, lower_y, 0)) {
return TRUE;
}
int dist_index = attention_info.distances[fopAc_attn_TALK_e];
dist_max = dComIfGp_getAttention().getDistTable(dist_index).mDistMax;
upper_y = dComIfGp_getAttention().getDistTable(dist_index).mUpperY;
lower_y = dComIfGp_getAttention().getDistTable(dist_index).mLowerY;
dist_max = dComIfGp_getAttention()->getDistTable(dist_index).mDistMax;
upper_y = dComIfGp_getAttention()->getDistTable(dist_index).mUpperY;
lower_y = dComIfGp_getAttention()->getDistTable(dist_index).mLowerY;
if (chkPointInArea(attn_pos, attention_info.position, dist_max, upper_y, lower_y, 0)
&& param_2 < 2 && param_7 && chkWolfAction())
{
@@ -2437,8 +2437,8 @@ void daNpcT_c::calcSpeedAndAngle(cXyz i_target, BOOL i_stop, s16 i_angleScale, s
*/
int daNpcT_c::getActorDistance(fopAc_ac_c* i_actor, int i_distIndex1, int i_distIndex2) {
int ret = 0;
f32 dist1 = dComIfGp_getAttention().getDistTable(i_distIndex1).mDistMax;
f32 dist2 = dComIfGp_getAttention().getDistTable(i_distIndex2).mDistMax;
f32 dist1 = dComIfGp_getAttention()->getDistTable(i_distIndex1).mDistMax;
f32 dist2 = dComIfGp_getAttention()->getDistTable(i_distIndex2).mDistMax;
f32 actor_dist = fopAcM_searchActorDistanceXZ(this, i_actor);
if (actor_dist < dist1) {
@@ -2697,19 +2697,19 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) {
if (daPy_getPlayerActorClass()->checkPriActorOwn(i_actor_p)) {
JUT_ASSERT(4965, 0 != dComIfGp_getAttention());
for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) {
if (dComIfGp_getAttention().ActionTarget(i) == i_actor_p &&
dComIfGp_getAttention().getActionBtnB() != NULL &&
dComIfGp_getAttention().getActionBtnB()->mType == 3)
for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) {
if (dComIfGp_getAttention()->ActionTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() != NULL &&
dComIfGp_getAttention()->getActionBtnB()->mType == 3)
{
ret = TRUE;
}
}
for (int i = 0; i < dComIfGp_getAttention().GetLockonCount(); i++) {
if (dComIfGp_getAttention().LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention().getActionBtnB() != NULL &&
dComIfGp_getAttention().getActionBtnB()->mType == 1)
for (int i = 0; i < dComIfGp_getAttention()->GetLockonCount(); i++) {
if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() != NULL &&
dComIfGp_getAttention()->getActionBtnB()->mType == 1)
{
ret = TRUE;
}
src/d/actor/d_a_npc4.cpp
+17 -17
View File
@@ -1358,14 +1358,14 @@ BOOL daNpcF_c::chkActorInArea(fopAc_ac_c* i_actor, cXyz i_center, cXyz i_bounds,
BOOL daNpcF_c::chkActorInAttnArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorAttn,
int i_distIndex) {
BOOL ret = false;
f32 neg_lower_y = dComIfGp_getAttention().getDistTable(i_distIndex).mLowerY * -1.0f;
f32 neg_upper_y = dComIfGp_getAttention().getDistTable(i_distIndex).mUpperY * -1.0f;
f32 neg_lower_y = dComIfGp_getAttention()->getDistTable(i_distIndex).mLowerY * -1.0f;
f32 neg_upper_y = dComIfGp_getAttention()->getDistTable(i_distIndex).mUpperY * -1.0f;
cXyz center = i_actorAttn->current.pos;
cXyz bounds;
bounds.x = dComIfGp_getAttention().getDistTable(i_distIndex).mDistMax;
bounds.x = dComIfGp_getAttention()->getDistTable(i_distIndex).mDistMax;
bounds.y = (fabsf(neg_lower_y) + fabsf(neg_upper_y)) / 2.0f;
bounds.z = dComIfGp_getAttention().getDistTable(i_distIndex).mDistMax;
bounds.z = dComIfGp_getAttention()->getDistTable(i_distIndex).mDistMax;
center.y = bounds.y + (center.y + neg_upper_y);
if (chkActorInArea(i_actorCheck, center, bounds, i_actorAttn->shape_angle.y)) {
@@ -1681,11 +1681,11 @@ BOOL daNpcF_c::chkFindPlayer2(BOOL i_hasAttn, s16 i_angle) {
cXyz attn_pos = getAttentionPos(daPy_getPlayerActorClass());
int attn_no = i_hasAttn == false ? attention_info.distances[fopAc_attn_SPEAK_e]
: attention_info.distances[fopAc_attn_TALK_e];
f32 dist_max = i_hasAttn == false ? dComIfGp_getAttention().getDistTable(attn_no).mDistMax
: dComIfGp_getAttention().getDistTable(attn_no).mDistMaxRelease;
f32 lower_y = dComIfGp_getAttention().getDistTable(attn_no).mLowerY * -1.0f;
f32 upper_y = dComIfGp_getAttention().getDistTable(attn_no).mUpperY * -1.0f;
u32 angle_select = dComIfGp_getAttention().getDistTable(attn_no).mAngleSelect;
f32 dist_max = i_hasAttn == false ? dComIfGp_getAttention()->getDistTable(attn_no).mDistMax
: dComIfGp_getAttention()->getDistTable(attn_no).mDistMaxRelease;
f32 lower_y = dComIfGp_getAttention()->getDistTable(attn_no).mLowerY * -1.0f;
f32 upper_y = dComIfGp_getAttention()->getDistTable(attn_no).mUpperY * -1.0f;
u32 angle_select = dComIfGp_getAttention()->getDistTable(attn_no).mAngleSelect;
f32 fovy = 180.0f;
if (angle_select & 8) {
@@ -1911,19 +1911,19 @@ bool daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) {
bool ret = FALSE;
if (daPy_getPlayerActorClass()->checkPriActorOwn(i_actor_p)) {
for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) {
if (dComIfGp_getAttention().ActionTarget(i) == i_actor_p &&
dComIfGp_getAttention().getActionBtnB() &&
dComIfGp_getAttention().getActionBtnB()->mType == 3)
for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) {
if (dComIfGp_getAttention()->ActionTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() &&
dComIfGp_getAttention()->getActionBtnB()->mType == 3)
{
ret = TRUE;
}
}
for (int i = 0; i < dComIfGp_getAttention().GetLockonCount(); i++) {
if (dComIfGp_getAttention().LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention().getActionBtnB() &&
dComIfGp_getAttention().getActionBtnB()->mType == 1)
for (int i = 0; i < dComIfGp_getAttention()->GetLockonCount(); i++) {
if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() &&
dComIfGp_getAttention()->getActionBtnB()->mType == 1)
{
ret = TRUE;
}
src/d/actor/d_a_npc_fairy_seirei.cpp
+4 -4
View File
@@ -163,10 +163,10 @@ void daNpc_FairySeirei_c::reset() {
void daNpc_FairySeirei_c::setParam() {
selectAction();
srchActors();
dComIfGp_getAttention().getDistTable(0x28).mDistMax = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention().getDistTable(0x27).mDistMax = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention()->getDistTable(0x28).mDistMax = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention()->getDistTable(0x28).mDistMaxRelease = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention()->getDistTable(0x27).mDistMax = daNpc_FairySeirei_Param_c::m[36];
dComIfGp_getAttention()->getDistTable(0x27).mDistMaxRelease = daNpc_FairySeirei_Param_c::m[36];
attention_info.distances[fopAc_attn_LOCK_e] = 0x27;
attention_info.distances[fopAc_attn_TALK_e] = 0x27;
attention_info.distances[fopAc_attn_SPEAK_e] = 0x27;
src/d/actor/d_a_npc_ks.cpp
+1 -1
View File
@@ -1625,7 +1625,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) {
a_this->attention_info.distances[3] = 2;
}
if (i_this == (npc_ks_class*)dComIfGp_getAttention().LockonTarget(0) && i_this->mTimers[2] == 0
if (i_this == (npc_ks_class*)dComIfGp_getAttention()->LockonTarget(0) && i_this->mTimers[2] == 0
&& mDoCPd_c::getTrigA(PAD_1) != 0) {
i_this->mMode = 17;
anm_init(i_this, 25, 2.0f, 0, 1.0f);
src/d/actor/d_a_npc_seib.cpp
+4 -4
View File
@@ -252,10 +252,10 @@ void daNpc_seiB_c::setParam() {
selectAction();
srchActors();
dComIfGp_getAttention().getDistTable(0x28).mDistMax = mpParam->m.mDist;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = mpParam->m.mDist;
dComIfGp_getAttention().getDistTable(0x27).mDistMax = mpParam->m.mDist;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = mpParam->m.mDist;
dComIfGp_getAttention()->getDistTable(0x28).mDistMax = mpParam->m.mDist;
dComIfGp_getAttention()->getDistTable(0x28).mDistMaxRelease = mpParam->m.mDist;
dComIfGp_getAttention()->getDistTable(0x27).mDistMax = mpParam->m.mDist;
dComIfGp_getAttention()->getDistTable(0x27).mDistMaxRelease = mpParam->m.mDist;
attention_info.distances[0] = 39;
attention_info.distances[1] = 39;
src/d/actor/d_a_npc_seic.cpp
+4 -4
View File
@@ -273,11 +273,11 @@ void daNpc_seiC_c::setParam() {
selectAction();
srchActors();
dComIfGp_getAttention().getDistTable(0x28).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x28).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x28).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x27).mDistMax = daNpc_seiC_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x27).mDistMaxRelease = daNpc_seiC_Param_c::m.field_0x90;
attention_info.distances[0] = 39;
attention_info.distances[1] = 39;
src/d/actor/d_a_npc_seid.cpp
+4 -4
View File
@@ -273,10 +273,10 @@ void daNpc_seiD_c::setParam() {
selectAction();
srchActors();
dComIfGp_getAttention().getDistTable(0x28).mDistMax = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x28).mDistMaxRelease = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMax = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention().getDistTable(0x27).mDistMaxRelease = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x28).mDistMax = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x28).mDistMaxRelease = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x27).mDistMax = daNpc_seiD_Param_c::m.field_0x90;
dComIfGp_getAttention()->getDistTable(0x27).mDistMaxRelease = daNpc_seiD_Param_c::m.field_0x90;
attention_info.distances[0] = 39;
attention_info.distances[1] = 39;
src/d/actor/d_a_npc_uri.cpp
+2 -2
View File
@@ -1486,8 +1486,8 @@ int daNpc_Uri_c::wait(void* param_0) {
if (!daNpcT_chkEvtBit(0x1e) && !daNpcT_chkEvtBit(0x92)) {
cXyz acStack_70 = getAttnPos(daPy_getPlayerActorClass());
int dist_index = attention_info.distances[1];
f32 fVar2 = dComIfGp_getAttention().getDistTable(dist_index).mLowerY * -1.0f;
f32 fVar3 = dComIfGp_getAttention().getDistTable(dist_index).mUpperY * -1.0f;
f32 fVar2 = dComIfGp_getAttention()->getDistTable(dist_index).mLowerY * -1.0f;
f32 fVar3 = dComIfGp_getAttention()->getDistTable(dist_index).mUpperY * -1.0f;
if (chkPointInArea(acStack_70, attention_info.position, 200.0f, fVar2, fVar3,
0))
{
src/d/actor/d_a_obj_gra_rock.cpp
+3 -3
View File
@@ -36,9 +36,9 @@ void daObjGraRock_c::setAttnPos() {
attention_info.position += current.pos;
attention_info.distances[0] = daNpcF_getDistTableIdx(8, 5);
attention_info.flags = 1;
dAttention_c& attention = dComIfGp_getAttention();
if (attention.LockonTruth()) {
if (attention.LockonTarget(0) == this && field_0x9bc == 0 && field_0x9b6 == 0) {
dAttention_c* attention = dComIfGp_getAttention();
if (attention->LockonTruth()) {
if (attention->LockonTarget(0) == this && field_0x9bc == 0 && field_0x9b6 == 0) {
field_0x9b6 = 90;
field_0x9bd = 3;
s16 sVar4 = cLib_getRndValue(0, 0x10000);
src/d/actor/d_a_obj_master_sword.cpp
+4 -4
View File
@@ -37,10 +37,10 @@ void daObjMasterSword_c::initWait() {
*/
void daObjMasterSword_c::executeWait() {
if (daPy_getPlayerActorClass()->checkPriActorOwn(this)) {
for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) {
if (dComIfGp_getAttention().ActionTarget(i) == this) {
if (dComIfGp_getAttention().getActionBtnB() != NULL &&
dComIfGp_getAttention().getActionBtnB()->mType == 4)
for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) {
if (dComIfGp_getAttention()->ActionTarget(i) == this) {
if (dComIfGp_getAttention()->getActionBtnB() != NULL &&
dComIfGp_getAttention()->getActionBtnB()->mType == 4)
{
dComIfGp_setDoStatusForce(8, 0);
}

Some files were not shown because too many files have changed in this diff Show More