mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-16 14:50:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 12:55:28 -07:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_tbox2.cpp
+4 -4
View File
@@ -379,10 +379,10 @@ void daTbox2_c::actionOpenWait() {
daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor(); // cast needed for reg alloc
daPy_py_c* player_p = daPy_getPlayerActorClass();
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
dComIfGp_event_onEventFlag(4);
if (mModelType != TYPE_SMALL_e && daPy_py_c::i_checkNowWolf() &&
if (mModelType != TYPE_SMALL_e && daPy_py_c::checkNowWolf() &&
!midna_p->checkMetamorphoseEnable())
{
mStaffIdx = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
@@ -396,11 +396,11 @@ void daTbox2_c::actionOpenWait() {
init_actionOpenDemo();
}
} else if (boxCheck()) {
eventInfo.i_onCondition(dEvtCnd_CANDOOR_e);
eventInfo.onCondition(dEvtCnd_CANDOOR_e);
if (mModelType == TYPE_SMALL_e) {
eventInfo.setEventName("DEFAULT_TREASURE_SIMPLE");
} else if (daPy_py_c::i_checkNowWolf() && !midna_p->checkMetamorphoseEnable()) {
} else if (daPy_py_c::checkNowWolf() && !midna_p->checkMetamorphoseEnable()) {
eventInfo.setEventName("DEFAULT_TREASURE_NOTOPEN");
} else {
eventInfo.setEventName("DEFAULT_TREASURE_NORMAL");