mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-04 17:09:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match warpgn for demo

Browse Source
This commit is contained in:
LagoLunatic
2025-12-27 16:38:56 -05:00
parent 4547fcca91
commit 47ce38557b
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1788,7 +1788,7 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tori_flag"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_wall"),
ActorRel(Matching, "d_a_warpfout"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_warpgn"),
ActorRel(Matching, "d_a_warpgn"),
ActorRel(NonMatching, "d_a_warpls"),
ActorRel(NonMatching, "d_a_warpmj"),
ActorRel(NonMatching, "d_a_waterfall"),
src/d/actor/d_a_warpgn.cpp
+11 -7
View File
@@ -177,7 +177,7 @@ bool daWarpgn_c::_execute() {
demo_execute();
}
if (m388 != false || dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D02) != 0) {
if (m388 || dComIfGs_isEventBit(dSv_event_flag_c::UNK_3D02) != 0) {
fopAcM_seStart(this, JA_SE_OBJ_GN_WAPR_EFF, 0);
}
mpModel->setBaseScale(scale);
@@ -252,7 +252,7 @@ void daWarpgn_c::demo_proc() {
(this->*event_init_tbl[action_index])(mStaffId);
}
if ((this->*event_action_tbl[action_index])(mStaffId) != FALSE) {
if ((this->*event_action_tbl[action_index])(mStaffId)) {
dComIfGp_evmng_cutEnd(mStaffId);
}
}
@@ -393,24 +393,28 @@ void daWarpgn_c::eventOrder() {
/* 0000114C-00001258 .text checkOrder__10daWarpgn_cFv */
void daWarpgn_c::checkOrder() {
if (eventInfo.checkCommandDemoAccrpt()) {
if ((dComIfGp_evmng_startCheck(mEvtToMajyuuWarpIdx) != FALSE) && (m2C4 != 0)) {
if (dComIfGp_evmng_startCheck(mEvtToMajyuuWarpIdx) && m2C4 != 0) {
m2C4 = 0;
}
if ((dComIfGp_evmng_startCheck(mEvtAppearWarpIdx) != FALSE) && (m2C4 != 0)) {
if (dComIfGp_evmng_startCheck(mEvtAppearWarpIdx) && m2C4 != 0) {
m2C4 = 0;
}
if (dComIfGp_evmng_endCheck(mEvtToMajyuuWarpIdx) != FALSE) {
if (dComIfGp_evmng_endCheck(mEvtToMajyuuWarpIdx)) {
dLib_setNextStageBySclsNum(mSceneNo, fopAcM_GetRoomNo(this));
}
if (dComIfGp_evmng_endCheck(mEvtAppearWarpIdx) != FALSE) {
if (dComIfGp_evmng_endCheck(mEvtAppearWarpIdx)) {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_3D02);
mEvtAppearWarpIdx = -1;
dComIfGp_event_reset();
}
} else if (m2C4 == 0) {
} else if (m2C4 == 0
#if VERSION == VERSION_DEMO
&& !dComIfGp_event_runCheck()
#endif
) {
normal_execute();
}
}