encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use attention enums everywhere instead of integer literals (#3044)

Browse Source
This commit is contained in:
Max Roncace
2026-01-14 16:55:59 +02:00
committed by GitHub
parent c0e0bbaaf3
commit 93dcac3343
59 changed files with 160 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor.h
+28 -19
View File
@@ -91,38 +91,47 @@ enum fopAc_attention_type {
/* 0x2 */ fopAc_attn_BATTLE_e,
#if !PLATFORM_GCN
fopAc_attn_UNK_3,
fopAc_attn_UNK_4,
fopAc_attn_UNK_5,
/* 0x3 */ fopAc_attn_UNK_3,
/* 0x4 */ fopAc_attn_UNK_4,
/* 0x5 */ fopAc_attn_UNK_5,
#endif
/* 0x3 */ fopAc_attn_SPEAK_e,
/* 0x4 */ fopAc_attn_CARRY_e,
/* 0x5 */ fopAc_attn_DOOR_e,
/* 0x6 */ fopAc_attn_JUEL_e,
/* 0x3 (0x6) */ fopAc_attn_SPEAK_e,
/* 0x4 (0x7) */ fopAc_attn_CARRY_e,
/* 0x5 (0x8) */ fopAc_attn_DOOR_e,
/* 0x6 (0x9) */ fopAc_attn_JUEL_e,
#if !PLATFORM_GCN
fopAc_attn_UNK_10,
/* 0xA */ fopAc_attn_UNK_10,
#endif
/* 0x7 */ fopAc_attn_ETC_e,
/* 0x8 */ fopAc_attn_CHECK_e,
/* 0x7 (0xB) */ fopAc_attn_ETC_e,
/* 0x8 (0xC) */ fopAc_attn_CHECK_e,
fopAc_attn_MAX_e,
};
enum fopAc_AttentionFlag_e {
/* 0x00000001 */ fopAc_AttnFlag_LOCK_e = (1 << fopAc_attn_LOCK_e),
/* 0x00000002 */ fopAc_AttnFlag_TALK_e = (1 << fopAc_attn_TALK_e),
/* 0x00000004 */ fopAc_AttnFlag_BATTLE_e = (1 << fopAc_attn_BATTLE_e),
/* 0x00000001 */ fopAc_AttnFlag_LOCK_e = (1 << fopAc_attn_LOCK_e),
/* 0x00000002 */ fopAc_AttnFlag_TALK_e = (1 << fopAc_attn_TALK_e),
/* 0x00000004 */ fopAc_AttnFlag_BATTLE_e = (1 << fopAc_attn_BATTLE_e),
/* 0x00000008 */ fopAc_AttnFlag_SPEAK_e = (1 << fopAc_attn_SPEAK_e),
/* 0x00000010 */ fopAc_AttnFlag_CARRY_e = (1 << fopAc_attn_CARRY_e),
/* 0x00000020 */ fopAc_AttnFlag_DOOR_e = (1 << fopAc_attn_DOOR_e),
/* 0x00000040 */ fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e),
/* 0x00000080 */ fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e),
#if !PLATFORM_GCN
/* 0x00000008 */ fopAc_AttnFlag_UNK_3_e = (1 << fopAc_attn_UNK_3),
/* 0x00000010 */ fopAc_AttnFlag_UNK_4_e = (1 << fopAc_attn_UNK_4),
/* 0x00000020 */ fopAc_AttnFlag_UNK_5_e = (1 << fopAc_attn_UNK_5),
#endif
/* 0x00000100 */ fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e),
/* 0x00000008 (0x00000040) */ fopAc_AttnFlag_SPEAK_e = (1 << fopAc_attn_SPEAK_e),
/* 0x00000010 (0x00000080) */ fopAc_AttnFlag_CARRY_e = (1 << fopAc_attn_CARRY_e),
/* 0x00000020 (0x00000100) */ fopAc_AttnFlag_DOOR_e = (1 << fopAc_attn_DOOR_e),
/* 0x00000040 (0x00000200) */ fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e),
#if !PLATFORM_GCN
/* 0x00000400 */ fopAc_AttnFlag_UNK_10_e = (1 << fopAc_attn_UNK_10),
#endif
/* 0x00000080 (0x00000800) */ fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e),
/* 0x00000100 (0x00001000) */ fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e),
/* 0x00200000 */ fopAc_AttnFlag_UNK_0x200000 = 0x200000,
/* 0x00400000 */ fopAc_AttnFlag_UNK_0x400000 = 0x400000,
src/d/actor/d_a_b_gnd.cpp
+1 -1
View File
@@ -4787,7 +4787,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
l_HIO.no = mDoHIO_CREATE_CHILD("ガノンドロフ", &l_HIO);
}
a_this->attention_info.distances[2] = 36;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 36;
fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(a_this, -400.0f, -200.0f, -400.0f);
src/d/actor/d_a_cstatue.cpp
+2 -2
View File
@@ -321,7 +321,7 @@ int daCstatue_c::create() {
dComIfGs_onTbox(20);
}
}
attention_info.distances[4] = 8;
attention_info.distances[fopAc_attn_CARRY_e] = 8;
fopAcM_SetMtx(this, mModel->getBaseTRMtx());
int acchTblSize;
if (mType == daCstatueType_Normal || mType == daCstatueType_Normal2) {
@@ -376,7 +376,7 @@ int daCstatue_c::create() {
}
mSph->SetTgType(0xd97afddf);
mControlDistanceOffset = JMAFastSqrt(650000.0f);
attention_info.distances[0] = 92;
attention_info.distances[fopAc_attn_LOCK_e] = 92;
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_LOCK_e);
mTargetFrame = 35.0f;
}
src/d/actor/d_a_e_ge.cpp
+1 -1
View File
@@ -1315,7 +1315,7 @@ int daE_GE_c::create() {
l_HIO.id = mDoHIO_CREATE_CHILD("グェー", &l_HIO);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_hz.cpp
+1 -1
View File
@@ -1634,7 +1634,7 @@ void daE_HZ_c::action() {
setActionMode(ACTION_WATER_DEATH);
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
field_0x566 = 1;
switch (mAction) {
src/d/actor/d_a_e_kk.cpp
+5 -5
View File
@@ -876,7 +876,7 @@ void daE_KK_c::executeDead() {
case 0:
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
offHeadLockFlg();
health = 0;
speedF = 0.0f;
@@ -1266,8 +1266,8 @@ int daE_KK_c::execute() {
return 1;
}
if (attention_info.distances[2] == 0) {
attention_info.distances[2] = 0x45;
if (attention_info.distances[fopAc_attn_BATTLE_e] == 0) {
attention_info.distances[fopAc_attn_BATTLE_e] = 0x45;
fopAcM_SetGroup(this, 2);
fopAcM_OnStatus(this, 0);
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
@@ -1443,7 +1443,7 @@ int daE_KK_c::create() {
field_0x760 = current.pos.y;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0x4C;
attention_info.distances[fopAc_attn_BATTLE_e] = 0x4C;
if (field_0x679 != 3) {
setActionMode(0, 0);
@@ -1461,7 +1461,7 @@ int daE_KK_c::create() {
fopAcM_SetMax(this, 600.0f, 600.0f, 600.0f);
if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) {
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this, 0);
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
src/d/actor/d_a_e_mk.cpp
+1 -1
View File
@@ -2886,7 +2886,7 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) {
mk->sound.init(&i_actor->current.pos, &i_actor->eyePos, 3, 1);
mk->atInfo.mpSound = &mk->sound;
i_actor->attention_info.distances[2] = 4;
i_actor->attention_info.distances[fopAc_attn_BATTLE_e] = 4;
mk->stts.Init(0xFF, 0, i_actor);
mk->tgSph.Set(cc_sph_src);
src/d/actor/d_a_e_mm_mt.cpp
+2 -2
View File
@@ -134,7 +134,7 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) {
fopAcM_SetGroup(actor, 3);
fopAcM_OffStatus(actor, 0);
actor->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
actor->attention_info.distances[2] = 0;
actor->attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_OnStatus(actor, 0x400);
s16 actor_angle = player->shape_angle.y + 0x4000;
s16 angle = actor->shape_angle.y - actor_angle;
@@ -372,7 +372,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) {
i_this->enemy.attention_info.position = i_this->enemy.current.pos;
cLib_addCalcAngleS2(&i_this->m_rotation.z, (TREG_S(6)+0x10000)-0x8000, 1, 0x1000);
cLib_onBit<u32>(i_this->enemy.attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->enemy.attention_info.distances[4] = 7;
i_this->enemy.attention_info.distances[fopAc_attn_CARRY_e] = 7;
i_this->m_rotation.y += i_this->m_spin;
if (i_this->enemy.speedF >= 20.0f) {
i_this->m_sphere.OnAtSetBit();
src/d/actor/d_a_e_rd.cpp
+1 -1
View File
@@ -5237,7 +5237,7 @@ static void action(e_rd_class* i_this) {
if (i_this->field_0x9bc == 0) {
a_this->attention_info.distances[2] = 3;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 3;
if (i_this->field_0x9ec) {
cMtx_YrotS(*calc_mtx, i_this->field_0xa0c.y);
if (i_this->field_0xaf0 == 0) {
src/d/actor/d_a_e_sb.cpp
+1 -1
View File
@@ -1115,7 +1115,7 @@ cPhs__Step daE_SB_c::Create() {
}
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0x24;
attention_info.distances[fopAc_attn_BATTLE_e] = 0x24;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, 0.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_sw.cpp
+2 -2
View File
@@ -1755,10 +1755,10 @@ cPhs__Step daE_SW_c::create() {
if (field_0x694 == 0) {
mBgc.OnLineCheck();
field_0x698 = 2;
attention_info.distances[2] = 3;
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
d_setAction(&daE_SW_c::d_wait);
} else {
attention_info.distances[2] = 4;
attention_info.distances[fopAc_attn_BATTLE_e] = 4;
if (field_0x6dc > 1.0f) {
field_0x98c.SetAtSpl((dCcG_At_Spl)1);
src/d/actor/d_a_e_tk.cpp
+1 -1
View File
@@ -720,7 +720,7 @@ static int daE_TK_Create(fopAc_ac_c* i_this) {
fopAcM_SetMin(a_this, -100.0f, -100.0f, -100.0f);
fopAcM_SetMax(a_this, 100.0f, 100.0f, 100.0f);
a_this->attention_info.distances[2] = 0x04;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 0x04;
a_this->health = 10;
a_this->field_0x560 = 10;
src/d/actor/d_a_e_tk2.cpp
+1 -1
View File
@@ -524,7 +524,7 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) {
fopAcM_SetMin(a_this, -100.0f, -100.0f, -100.0f);
fopAcM_SetMax(a_this, 100.0f, 100.0f, 100.0f);
a_this->attention_info.distances[2] = 0x04;
a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 0x04;
a_this->health = 0;
a_this->field_0x560 = 0;
src/d/actor/d_a_e_tt.cpp
+1 -1
View File
@@ -1278,7 +1278,7 @@ int daE_TT_c::create() {
l_HIO.id = mDoHIO_CREATE_CHILD("テクタイト", &l_HIO); // Tektite
}
attention_info.flags = 4;
attention_info.flags = fopAc_AttnFlag_BATTLE_e;
fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
src/d/actor/d_a_e_ym.cpp
+15 -15
View File
@@ -562,7 +562,7 @@ void daE_YM_c::setAppear() {
mType = 0;
}
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
}
void daE_YM_c::setMoveSound(int param_0) {
@@ -689,7 +689,7 @@ void daE_YM_c::executeWait() {
case 1:
field_0x718 = 1;
if (field_0x6d4) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
} else {
field_0x714 = 0;
}
@@ -727,13 +727,13 @@ void daE_YM_c::executeWait() {
case 4: {
if (field_0x6d4) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
} else {
field_0x714 = 0;
}
if (dComIfGs_isSwitch(field_0x6a3, fopAcM_GetRoomNo(this)) && mType == 1) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
if (mTagPosP != NULL) {
setActionMode(ACT_FLY);
} else {
@@ -2259,7 +2259,7 @@ void daE_YM_c::executeRail() {
case 0: {
mIsHide = 1;
field_0x6a6 = 4;
field_0x714 |= 4;
field_0x714 |= fopAc_AttnFlag_BATTLE_e;
field_0x6dc = -70.0f;
dPnt* point_p = dPath_GetPnt(mpPath, mCurrentPntNo);
current.pos = old.pos = point_p->m_position;
@@ -2361,14 +2361,14 @@ void daE_YM_c::executeBackRail() {
field_0x6a5 = 0;
mSphCc.SetCoSPrm(0x145);
mSphCc.SetTgType(0x10000);
field_0x714 &= ~0x4;
field_0x714 &= ~fopAc_AttnFlag_BATTLE_e;
bckSet(0x10, 2, 3.0f, 0.0f);
} else {
if (field_0x6a5 == 2) {
field_0x6f0 = 0xf;
mSphCc.SetCoSPrm(0x145);
mSphCc.SetTgType(0x10000);
field_0x714 &= ~0x4;
field_0x714 &= ~fopAc_AttnFlag_BATTLE_e;
} else {
field_0x6f0 = 7;
}
@@ -2413,7 +2413,7 @@ void daE_YM_c::executeBackRail() {
// following needed for both (a) dbg stack reg to use r31, and (b) force b instruction in asm:
int _;
if (field_0x6f0 == 0) {
field_0x714 |= 4;
field_0x714 |= fopAc_AttnFlag_BATTLE_e;
setActionMode(ACT_RAIL);
}
@@ -2499,7 +2499,7 @@ void daE_YM_c::executeSwitch() {
mIsHide = 1;
if (mpPath != NULL) {
if (mpPath->field_0x4 == 1) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
} else {
field_0x714 = 0;
field_0x6cf = 0;
@@ -2627,7 +2627,7 @@ void daE_YM_c::executeFire() {
}
}
if (field_0x6d4) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
} else {
field_0x714 = 0;
}
@@ -2655,7 +2655,7 @@ void daE_YM_c::executeFire() {
field_0x6cc = 1;
}
if (mpMorf->checkFrame(14.0f)) {
attention_info.distances[2] = 0x2e;
attention_info.distances[fopAc_attn_BATTLE_e] = 0x2e;
gravity = 0.0f;
fopAcM_SearchByName(0x1f7, &field_0x660);
if (field_0x660 != NULL) {
@@ -2751,7 +2751,7 @@ void daE_YM_c::executeFire() {
void daE_YM_c::setRiverAttention() {
cXyz player_pos = daPy_getPlayerActorClass()->current.pos;
attention_info.distances[2] = 60;
attention_info.distances[fopAc_attn_BATTLE_e] = 60;
field_0x714 = 0;
if (current.pos.abs(mpKago->current.pos) > 2000.0f) {
return;
@@ -2764,7 +2764,7 @@ void daE_YM_c::setRiverAttention() {
mDoMtx_stack_c::multVecZero(&my_vec_0);
my_vec_1.set(my_vec_0.x, my_vec_0.z, my_vec_0.y);
if (abs(cM_atan2s(my_vec_1.y, my_vec_1.absXZ()) - 0x4000) < 0x2000) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
}
}
@@ -2862,7 +2862,7 @@ void daE_YM_c::executeRiver() {
next_path = mpKago->checkNextPath(current.pos);
if (mpKago->isFlying()) {
if (field_0x6f2) {
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
if (next_path < 200.0f) {
cLib_chaseF(&field_0x6ec, 70.0f, 1.0f);
} else if (next_path > 1000.0f) {
@@ -3602,7 +3602,7 @@ int daE_YM_c::create() {
l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("闇の虫", &l_HIO);
}
field_0x714 = 4;
field_0x714 = fopAc_AttnFlag_BATTLE_e;
attention_info.distances[fopAc_attn_BATTLE_e] = 58;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_SetMin(this, -200.0f, -100.0f, -200.0f);
src/d/actor/d_a_e_ymb.cpp
+2 -2
View File
@@ -2752,9 +2752,9 @@ void daE_YMB_c::action() {
}
if (mAction != 5) {
attention_info.distances[2] = 24;
attention_info.distances[fopAc_attn_BATTLE_e] = 24;
} else {
attention_info.distances[2] = 25;
attention_info.distances[fopAc_attn_BATTLE_e] = 25;
}
field_0x712 = 0;
src/d/actor/d_a_e_zh.cpp
+9 -9
View File
@@ -814,7 +814,7 @@ void daE_ZH_c::executeWait() {
switch (mMoveMode) {
case 0:
attention_info.distances[2] = 3;
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
fopAcM_OnStatus(this, 0);
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
setBck(BCK_ZH_WAIT01, 0, 3.0f, 1.0f);
@@ -871,7 +871,7 @@ void daE_ZH_c::executeBallWait() {
if (bitSw != 0xFF && fopAcM_isSwitch(this, bitSw) && mStartFlag != 0) {
fopAcM_OnStatus(this, 0);
attention_info.flags |= fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 3;
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
mMoveMode = 10;
}
break;
@@ -1498,7 +1498,7 @@ void daE_ZH_c::executeCatchFlyMove() {
case 12:
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
for (int i = 0; i < 3; i++) {
field_0x764[i] = 0.0f;
@@ -1639,7 +1639,7 @@ void daE_ZH_c::executeFlyDelete() {
case 0:
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
if (bitSw != 0xFF && fopAcM_isSwitch(this, bitSw)) {
fopAcM_offSwitch(this, bitSw);
@@ -1662,7 +1662,7 @@ void daE_ZH_c::executeFlyDelete() {
if (fabsf(current.pos.y - (fopAcM_rc_c::getRoofY() + 200.0f)) < 20.0f) {
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
if (arg0 == 0) {
setActionMode(ACTION_EXECUTE_WAIT, 0);
@@ -2191,7 +2191,7 @@ cPhs__Step daE_ZH_c::create() {
if (arg0 == 2) {
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_SetGroup(this, 0);
fopAcM_SetMin(this, -2000.0f, -2000.0f, -2000.0f);
fopAcM_SetMax(this, 2000.0f, 2000.0f, 2000.0f);
@@ -2255,7 +2255,7 @@ cPhs__Step daE_ZH_c::create() {
shape_angle.z = 0;
shape_angle.x = 0;
attention_info.distances[2] = 3;
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
@@ -2283,7 +2283,7 @@ cPhs__Step daE_ZH_c::create() {
setBck(BCK_ZH_WAIT01, 0, 3.0f, 1.0f);
field_0x78c = 0;
attention_info.distances[2] = 3;
attention_info.distances[fopAc_attn_BATTLE_e] = 3;
fopAcM_OffStatus(this, 0);
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
@@ -2300,7 +2300,7 @@ cPhs__Step daE_ZH_c::create() {
setActionMode(ACTION_EXECUTE_DEAD_STOP, 0);
}
} else {
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
field_0x764[0] = 255.0f;
field_0x764[2] = 50.0f;
mStartFlag = 0;
src/d/actor/d_a_e_zm.cpp
+1 -1
View File
@@ -416,7 +416,7 @@ void daE_ZM_c::executeWait() {
mTimer = l_HIO.wait_time_to_appear_after_attack;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
fopAcM_OffStatus(this, 0);
attention_info.flags &= 0xFFFFFFFB;
attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e;
shape_angle.x = 0;
field_0x6f4.set(0.0f, 0.0f, 0.0f);
setActionMode(ACTION_WAIT, MODE_0);
src/d/actor/d_a_e_zs.cpp
+1 -1
View File
@@ -548,7 +548,7 @@ int daE_ZS_c::create() {
shape_angle.z = 0;
shape_angle.x = 0;
attention_info.distances[2] = 0;
attention_info.distances[fopAc_attn_BATTLE_e] = 0;
daE_ZS_Execute(this);
mCyl.OffTgSetBit();
mCyl.OffCoSetBit();
src/d/actor/d_a_ep.cpp
+1 -1
View File
@@ -937,7 +937,7 @@ static int daEp_Create(fopAc_ac_c* a_this) {
}
i_this->field_0xa5c = -1;
i_this->attention_info.distances[4] = 7;
i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7;
fopAcM_OnCarryType(i_this, fopAcM_CARRY_UNK_30);
i_this->mSph2.Set(at_sph_src);

Some files were not shown because too many files have changed in this diff Show More