mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-27 06:31:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_ot.cpp
+20 -20
View File
@@ -161,7 +161,7 @@ void daE_OT_c::damage_check() {
if (mCcSph.ChkCoHit()) {
fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc());
if (fopAcM_GetName(dCc_GetAc(hit_actor)) == PROC_E_DT
if (fopAcM_GetName(dCc_GetAc(hit_actor)) == fpcNm_E_DT_e
&& static_cast<daE_DT_c*>(hit_actor)->isFlyingAttack())
{
setActionMode(ACT_DAMAGE, 10);
@@ -530,7 +530,7 @@ void daE_OT_c::executeDamage() {
}
fopAcM_delete(this);
if (cM_rnd() < l_HIO.mHeartDropRate) {
fopAcM_createItem(&current.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&current.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
}
break;
@@ -567,14 +567,14 @@ void daE_OT_c::executeDamage() {
}
fopAcM_delete(this);
if (cM_rnd() < l_HIO.mHeartDropRate) {
fopAcM_createItem(&current.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&current.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
break;
}
}
void daE_OT_c::action() {
fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor);
fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor);
if (mpToadActor == NULL || fpcM_IsCreating(fopAcM_GetID(mpToadActor))
|| mpToadActor->isDead() == 2)
@@ -777,7 +777,7 @@ cPhs_Step daE_OT_c::create() {
mAtInfo.mpSound = &mSound;
mAtInfo.mPowerType = 1;
gravity = 0.0f;
fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor);
fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor);
mChildNo = fopAcM_GetParam(this) & 0xffff;
mDemoMode = (fopAcM_GetParam(this) >> 0x10) & 0xff;
@@ -787,7 +787,7 @@ cPhs_Step daE_OT_c::create() {
switch (mDemoMode) {
case 3:
fopAcM_OnStatus(this, 0x8000);
fopAcM_OnStatus(this, fopAcStts_STAFF_PRIMARY_e);
// fallthrough
case 0:
@@ -838,20 +838,20 @@ static actor_method_class l_daE_OT_Method = {
};
actor_process_profile_definition g_profile_E_OT = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_OT, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_OT_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
203, // mPriority
&l_daE_OT_Method, // sub_method
0x00050100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_OT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_OT_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_OT_e,
/* Actor SubMtd */ &l_daE_OT_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES