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

Actor attention flag enum cleanup

Browse Source
This commit is contained in:
LagoLunatic
2023-10-19 15:37:23 -04:00
parent 57d4fc32b4
commit 94777d2c0c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor.h
+3 -3
View File
@@ -55,9 +55,9 @@ enum fopAc_AttentionFlag_e {
fopAc_Attn_ACTION_DOOR_e = 0x00000020,
fopAc_Attn_ACTION_TREASURE_e = 0x00000040,
fopAc_Attn_ACTION_SHIP_e = 0x00000080,
fopAc_Attn_TALKFLAG_NOTALK_e = 0x2000000,
fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x4000000,
fopAc_Attn_TALKFLAG_LOOK_e = 0x8000000,
fopAc_Attn_TALKFLAG_NOTALK_e = 0x02000000,
fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x04000000,
fopAc_Attn_TALKFLAG_LOOK_e = 0x08000000,
fopAc_Attn_TALKFLAG_CHECK_e = 0x20000000,
fopAc_Attn_TALKFLAG_READ_e = 0x40000000,
};
src/d/actor/d_a_mbdoor.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ BOOL daMbdoor_c::CreateInit() {
field_0x2bc = 30;
mAttentionInfo.mPosition.y += 250.0f;
mEyePos.y += 250.0f;
mAttentionInfo.mFlags = 0x20;
mAttentionInfo.mFlags = fopAc_Attn_ACTION_DOOR_e;
calcMtx();
mpBgW->Move();
mStatus = mStatus & ~0x3F | 0x2B;
src/d/actor/d_a_npc_kamome.cpp
+2 -2
View File
@@ -650,10 +650,10 @@ int daNpc_kam_c::waitNpcAction(void*) {
mC0C = cLib_getRndValue(10, 80);
} else if (mActionStatus != ACTION_ENDING) {
if (changeAreaCheck()) {
cLib_onBit(mAttentionInfo.mFlags, 0x02000008UL);
mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e;
mEventState = 6;
} else {
cLib_offBit(mAttentionInfo.mFlags, 0x02000008UL);
mAttentionInfo.mFlags &= ~(fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e);
mEventState = -1;
}
src/d/actor/d_a_obj_mknjd.cpp
+1 -1
View File
@@ -370,7 +370,7 @@ int daObjMknjD::Act_c::Create() {
mAttentionInfo.mDistances[1] = 0x3D;
mAttentionInfo.mDistances[3] = 0x3D;
mAttentionInfo.mFlags |= 0x20000000 | 0x8;
mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
if (checkItemGet(mGiveItemId, 1) == 0) {
m043F = 8;