diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2025-04-01 22:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 19:05:30 -0700 |
| commit | e55c504f28caf0815a0bf7ba31c4014dd8d3d849 (patch) | |
| tree | 83510f9cd7889fa10bbdb5d522093c6977a99036 /src/d/d_msg_flow.cpp | |
| parent | 9847b2a2787b0db8ce931552fa6d99da21ad0873 (diff) | |
d_camera work (#2369)
* bumpCheck matching
* checkGroundInfo matching
* chaseCamera matching
* lockonCamera attempted
* talktoCamera matching
* subjectCamera, magneCamera matching
* colosseumCamera close, plus various fixes
* towerCamera attempted
* hookshotCamera matching
Diffstat (limited to 'src/d/d_msg_flow.cpp')
| -rw-r--r-- | src/d/d_msg_flow.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index b77b802bb8..10f6120434 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -513,9 +513,9 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_1, fopAc_ac_c** param_2) { if (msg == NULL) { field_0x25 = 1; } else { - int mesgCamInfo = dComIfGp_getMesgCameraInfo(); - if (mesgCamInfo != field_0x34) { - field_0x34 = mesgCamInfo; + int mesgCamInfoBasicID = dComIfGp_getMesgCameraInfo()->mBasicID; + if (mesgCamInfoBasicID != field_0x34) { + field_0x34 = mesgCamInfoBasicID; } switch (msg->mode) { case 2: @@ -591,9 +591,8 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { if (getParam(node->params) == 0) { int msgNum; if (daAlink_getAlinkActorClass()->getMidnaMsgNum() == 0xFFFF) { - s32 stayNo = dComIfGp_roomControl_getStayNo(); msgNum = - dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo()->mMsg; + dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo()->mMsg; } else { msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum(); daAlink_getAlinkActorClass()->setMidnaMsg(); |