scannon / scannon_crs / scannon_ten done (#2632)

* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
This commit is contained in:
TakaRikka
2025-09-08 02:01:20 -07:00
committed by GitHub
parent b35204b0c8
commit 5fce8ea1e1
244 changed files with 3067 additions and 3159 deletions
+2 -2
View File
@@ -220,13 +220,13 @@ void daObjNameplate_c::messageProc() {
cLib_distanceAngleS(shape_angle.GetY(), fopAcM_searchPlayerAngleY(this)) < 0x3000)
{
fopAcM_OnStatus(this, 0);
cLib_onBit<u32>(attention_info.flags, 0x4000000A);
cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_TALKREAD_e | fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
attention_info.distances[fopAc_attn_TALK_e] = 0x15;
attention_info.distances[fopAc_attn_SPEAK_e] = 0x15;
eventInfo.onCondition(1);
} else {
fopAcM_OffStatus(this, 0);
cLib_offBit<u32>(attention_info.flags, 0x4000000A);
cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_TALKREAD_e | fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
}
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) {