summaryrefslogtreecommitdiff
path: root/src/d/d_msg_flow.cpp
diff options
context:
space:
mode:
authorCaroline Madsen <69010899+randomsalience@users.noreply.github.com>2025-02-23 17:43:25 -0500
committerGitHub <noreply@github.com>2025-02-23 14:43:25 -0800
commite3d0b94122116ae1cd8188078ad6e710eb54a26c (patch)
treeebca4b093d6afcaa9f344e99cd11bc3de0024169 /src/d/d_msg_flow.cpp
parent531a6d6d68655a1e7aad0b511971ff6c777e6d86 (diff)
d_a_npc work (#2306)
Diffstat (limited to 'src/d/d_msg_flow.cpp')
-rw-r--r--src/d/d_msg_flow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp
index e77a2ab111..317cfa0c45 100644
--- a/src/d/d_msg_flow.cpp
+++ b/src/d/d_msg_flow.cpp
@@ -593,7 +593,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) {
if (daAlink_getAlinkActorClass()->getMidnaMsgNum() == 0xFFFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
msgNum =
- dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg;
+ dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo()->mMsg;
} else {
msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum();
daAlink_getAlinkActorClass()->setMidnaMsg();
@@ -1615,10 +1615,10 @@ int dMsgFlow_c::event019(mesg_flow_node_event*, fopAc_ac_c*) {
int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) {
int prm0 = getParam(flow_node->params);
daPy_py_c* player = daPy_getPlayerActorClass();
- dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor));
- stage_actor_data_class* actor_data = room->mRoomDt.getPlayer()->mEntries;
+ dStage_roomDt_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor));
+ stage_actor_data_class* actor_data = room->getPlayer()->mEntries;
- for (int i = 0; i < room->mRoomDt.getPlayerNum(); i++, actor_data++) {
+ for (int i = 0; i < room->getPlayerNum(); i++, actor_data++) {
if ((u8)actor_data->mAngle.z == prm0) {
player->setPlayerPosAndAngle(&actor_data->mSpawnPos, player->current.angle.y, 0);
break;