mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-04 10:26:16 -04:00
Fix softlock when entering Faron cave (and maybe others) in Release
This commit is contained in:
@@ -905,9 +905,16 @@ s32 daE_FZ_c::_delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if TARGET_PC
|
||||
static int daE_FZ_Delete(daE_FZ_c* i_this) {
|
||||
i_this->_delete();
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
static void daE_FZ_Delete(daE_FZ_c* i_this) {
|
||||
i_this->_delete();
|
||||
}
|
||||
#endif
|
||||
|
||||
s32 daE_FZ_c::CreateHeap() {
|
||||
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_FZ", 3);
|
||||
|
||||
@@ -2662,10 +2662,18 @@ int daE_OC_c::_delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if TARGET_PC
|
||||
static int daE_OC_Delete(daE_OC_c* i_this) {
|
||||
fopAcM_RegisterDeleteID(i_this, "E_OC");
|
||||
i_this->_delete();
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
static void daE_OC_Delete(daE_OC_c* i_this) {
|
||||
fopAcM_RegisterDeleteID(i_this, "E_OC");
|
||||
i_this->_delete();
|
||||
}
|
||||
#endif
|
||||
|
||||
int daE_OC_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(mName, 0x3);
|
||||
|
||||
@@ -202,9 +202,16 @@ static u32 daObj_Stick_Create(void* i_this) {
|
||||
return static_cast<daObj_Stick_c*>(i_this)->create();
|
||||
}
|
||||
|
||||
#if TARGET_PC
|
||||
static int daObj_Stick_Delete(void* param_0) {
|
||||
static_cast<daObj_Stick_c*>(param_0)->Delete();
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
static void daObj_Stick_Delete(void* param_0) {
|
||||
static_cast<daObj_Stick_c*>(param_0)->Delete();
|
||||
}
|
||||
#endif
|
||||
|
||||
static void daObj_Stick_Execute(void* param_0) {
|
||||
static_cast<daObj_Stick_c*>(param_0)->Execute();
|
||||
|
||||
@@ -44,10 +44,18 @@ int daTagMagne_c::_delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if TARGET_PC
|
||||
static int daTagMagne_Delete(daTagMagne_c* i_this) {
|
||||
int id = fopAcM_GetID(i_this);
|
||||
i_this->_delete();
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
static void daTagMagne_Delete(daTagMagne_c* i_this) {
|
||||
int id = fopAcM_GetID(i_this);
|
||||
i_this->_delete();
|
||||
}
|
||||
#endif
|
||||
|
||||
static void daTagMagne_Create(fopAc_ac_c* i_this) {
|
||||
daTagMagne_c* magne = static_cast<daTagMagne_c*>(i_this);
|
||||
|
||||
Reference in New Issue
Block a user