diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-03-04 17:33:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 18:33:13 -0700 |
| commit | 22e941fd8c506a8b8ee0d963c5e50dae7ba379bc (patch) | |
| tree | 60ff96023e00e3fb824fa4170fb1c61110f8192b /src/d/msg/d_msg_flow.cpp | |
| parent | 7ba8c332c7d39db792f7dbfe4e17c00ece24b3d4 (diff) | |
d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084)
Diffstat (limited to 'src/d/msg/d_msg_flow.cpp')
| -rw-r--r-- | src/d/msg/d_msg_flow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 89087af763..e1c2d3218c 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -1213,10 +1213,10 @@ int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, #ifdef NONMATCHING int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { u32 uVar3 = *(u16*)(flow_node->params); - cXyz this_00 = daPy_getPlayerActorClass()->mAttentionInfo.mPosition; + cXyz this_00 = daPy_getPlayerActorClass()->attention_info.position; this_00.y -= daPy_getPlayerActorClass()->getAttentionOffsetY(); - s16 uVar8 = (cSGlobe(param_1->mAttentionInfo.mPosition - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY()); - u8 attentionId = param_1->mAttentionInfo.field_0x0[3]; + s16 uVar8 = (cSGlobe(param_1->attention_info.position - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY()); + u8 attentionId = param_1->attention_info.field_0x0[3]; f32 fVar1 = dAttention_c::getDistTable(attentionId).field_0x4; u16 x = uVar3; if (x != 0) { @@ -1224,7 +1224,7 @@ int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, } return (u16) dComIfGp_getAttention().checkDistance( - &this_00, uVar8, ¶m_1->mAttentionInfo.mPosition, fVar1, + &this_00, uVar8, ¶m_1->attention_info.position, fVar1, dAttention_c::getDistTable(attentionId).field_0x8, dAttention_c::getDistTable(attentionId).field_0xc, dAttention_c::getDistTable(attentionId).field_0x10); |