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

Make Proc_e enum values consistent across actors

Browse Source
This commit is contained in:
LagoLunatic
2026-03-12 17:26:42 -04:00
parent e580412bcf
commit 37000df61b
38 changed files with 192 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_daiocta.cpp
+25 -25
View File
@@ -173,7 +173,7 @@ void daDaiocta_c::_coHit(fopAc_ac_c* i_actor) {
if ((mMode == MODE_WAIT || mMode == MODE_DAMAGE_BOMB ||
mMode == MODE_APPEAR || mMode == MODE_DAMAGE) &&
bomb_p->chk_state(daBomb_c::STATE_4)) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
}
}
@@ -884,7 +884,7 @@ void daDaiocta_c::modeHide() {
f32 dist_xz = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
if ((dist_xz < mAppearRadius || dist_xz < l_HIO.mMinAppearRadius) &&
dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
@@ -925,7 +925,7 @@ void daDaiocta_c::modeAppearInit() {
/* 000020C8-0000236C .text modeAppear__11daDaiocta_cFv */
void daDaiocta_c::modeAppear() {
if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
}
if (DEMO_SELECT(mpEmitter, mParticleCallback.getEmitter())) {
@@ -968,7 +968,7 @@ void daDaiocta_c::modeAppear() {
}
if (dist <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
s16 target = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0));
cLib_addCalcAngleS2(&shape_angle.y, target, 4, l_HIO.m010);
@@ -980,7 +980,7 @@ void daDaiocta_c::modeAppear() {
/* 0000236C-000023B0 .text modeWaitInit__11daDaiocta_cFv */
void daDaiocta_c::modeWaitInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
}
}
@@ -988,18 +988,18 @@ void daDaiocta_c::modeWaitInit() {
void daDaiocta_c::modeWait() {
current.pos.y = mWaterY;
if (isDead() || l_HIO.m006 != 0) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
}
/* 00002458-000024D8 .text modeDamageInit__11daDaiocta_cFv */
void daDaiocta_c::modeDamageInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else {
mPrmIdx = 2;
setAnm();
@@ -1014,18 +1014,18 @@ void daDaiocta_c::modeDamageInit() {
void daDaiocta_c::modeDamage() {
current.pos.y = mWaterY;
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
if (mPrmIdx == 2) {
if (std::fabsf(current.pos.y - mWaterY) <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
}
@@ -1033,7 +1033,7 @@ void daDaiocta_c::modeDamage() {
/* 000025C4-0000268C .text modeDamageBombInit__11daDaiocta_cFv */
void daDaiocta_c::modeDamageBombInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else {
fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
mPrmIdx = 2;
@@ -1048,18 +1048,18 @@ void daDaiocta_c::modeDamageBombInit() {
void daDaiocta_c::modeDamageBomb() {
current.pos.y = mWaterY;
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
if (mPrmIdx == 2) {
if (std::fabsf(current.pos.y - mWaterY) <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
}
@@ -1297,10 +1297,10 @@ void daDaiocta_c::modeProc(daDaiocta_c::Proc_e i_procType, daDaiocta_c::Mode_e i
{ &daDaiocta_c::modeDemoInit, &daDaiocta_c::modeDemo, "DEMO" }
};
if (i_procType == PROC_INIT) {
if (i_procType == PROC_INIT_e) {
mMode = i_modeProc;
(this->*mode_tbl[mMode].mInitFunc)();
} else if (i_procType == PROC_EXEC) {
} else if (i_procType == PROC_EXEC_e) {
(this->*mode_tbl[mMode].mUpdFunc)();
}
}
@@ -1410,7 +1410,7 @@ bool daDaiocta_c::_execute() {
mMode != MODE_DEMO &&
mMode != MODE_DELETE &&
dist_angle_s < l_HIO.m012) {
modeProc(PROC_INIT, MODE_DEMO);
modeProc(PROC_INIT_e, MODE_DEMO);
}
#if VERSION > VERSION_DEMO
}
@@ -1437,7 +1437,7 @@ bool daDaiocta_c::_execute() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
}
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
if (mMode != MODE_HIDE) {
setCollision();
@@ -1603,7 +1603,7 @@ void daDaiocta_c::getArg() {
void daDaiocta_c::createInit() {
m220C = current.pos;
initAwa();
modeProc(PROC_INIT, MODE_HIDE);
modeProc(PROC_INIT_e, MODE_HIDE);
initMtx();
attention_info.flags = 0;
shape_angle = current.angle;