mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-25 06:41:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rando-mod' of https://github.com/TwilitRealm/dusk into rando-mod

Browse Source
This commit is contained in:
gymnast86
2026-08-21 15:53:02 -07:00
parent 28479314c2 1e8d72c3ed
commit 1b51fa0112
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_msg_flow.cpp
+7 -4
View File
@@ -43,6 +43,11 @@ u16 message_id(const MessageEntryData& entry) {
return static_cast<u16>(static_cast<u16>(entry.bytes[4]) << 8 | entry.bytes[5]);
}
u16 flow_group(int flowId) {
const bool isCommonFlow = flowId >= 3000 && flowId < dusk::flow::kCustomNodeMin;
return isCommonFlow ? 0 : static_cast<u16>(dMsgObject_getGroupID());
}
} // namespace
#endif
@@ -70,8 +75,7 @@ void dMsgFlow_c::init(fopAc_ac_c* i_partner, int i_flowID, int param_2, fopAc_ac
dMsgObject_changeFlowGroup(i_flowID);
#if TARGET_PC
dusk::flow::bind_resource(dMsgObject_getMsgDtPtr(),
i_flowID >= 3000 ? 0 : static_cast<u16>(dMsgObject_getGroupID()));
dusk::flow::bind_resource(dMsgObject_getMsgDtPtr(), flow_group(i_flowID));
#endif
if (param_2 == 0) {
@@ -399,8 +403,7 @@ void dMsgFlow_c::setInitValueGroupChange(int i_msgNo, fopAc_ac_c** i_talkPartner
dMsgObject_changeFlowGroup(i_msgNo);
#if TARGET_PC
dusk::flow::bind_resource(dMsgObject_getMsgDtPtr(),
i_msgNo >= 3000 ? 0 : static_cast<u16>(dMsgObject_getGroupID()));
dusk::flow::bind_resource(dMsgObject_getMsgDtPtr(), flow_group(i_msgNo));
#endif
setInitValue(0);
src/d/d_msg_object.cpp
+4
View File
@@ -1865,7 +1865,11 @@ void dMsgObject_c::readMessageGroupLocal(mDoDvdThd_mountXArchive_c** p_arcMount)
void dMsgObject_c::changeFlowGroupLocal(s32 param_0) {
mFlowChk = 1;
#if TARGET_PC
changeGroup(param_0 >= 3000 && param_0 < dusk::flow::kCustomNodeMin ? (s16)0 : s_groupID);
#else
changeGroup(param_0 >= 3000 ? (s16)0 : s_groupID);
#endif
}
void dMsgObject_c::demoMessageGroupLocal() {