mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-02 10:36:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from TwilitRealm/fix/quick-transform-fix

Browse Source 
Don't allow quick transform while in the STAR tent
This commit is contained in:
TakaRikka
2026-04-11 13:07:02 -07:00
committed by GitHub
parent 0b480fe9d8 8522d33935
commit 5977706618
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_dusk.cpp
+12 -5
View File
@@ -9,11 +9,6 @@ void daAlink_c::handleQuickTransform() {
return;
}
// Ensure that link is not in a cutscene.
if (checkEventRun()) {
return;
}
// Check to see if Link has the ability to transform.
if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
return;
@@ -30,8 +25,20 @@ void daAlink_c::handleQuickTransform() {
return;
}
// Ensure that link is not in a cutscene.
if (checkEventRun()) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
return;
}
mDoCPd_c::getCpadInfo(PAD_1).mPressedButtonFlags = 0;
// Don't allow quick transform while in the STAR tent.
if (checkStageName("R_SP161")) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
return;
}
// Ensure that the Z Button is not dimmed
if (meterDrawPtr->getButtonZAlpha() != 1.f) {
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);