mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-07 02:05:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

player_fan 99%

Browse Source
This commit is contained in:
LagoLunatic
2025-04-01 20:46:23 -04:00
parent bc4c7dd5f9
commit f2ff19c83e
8 changed files with 370 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_attention.cpp
+4 -4
View File
@@ -126,14 +126,14 @@ dAttList_c* dAttention_c::GetLockonList(s32 idx) {
dAttList_c* dAttention_c::getActionBtnB() {
int i;
dAttList_c* list = GetLockonList(0);
if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() != 0 && !(list->getActor()->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e))
if (list != NULL && list->getActor() != NULL && list->mType == fopAc_Attn_TYPE_TALK_e && LockonTruth() != 0 && !(list->getActor()->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e))
return list;
if (mActionNum == 0)
return NULL;
for (i = 0; i < mActionNum; i++) {
if (mActionList[i].mType == 3) {
if (mActionList[i].mType == fopAc_Attn_TYPE_SPEAK_e) {
if (!(mActionList[i].getActor()->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e))
return &mActionList[i];
} else {
@@ -148,7 +148,7 @@ dAttList_c* dAttention_c::getActionBtnB() {
dAttList_c* dAttention_c::getActionBtnXYZ_local(int button) {
int i;
dAttList_c* list = GetLockonList(0);
if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() != 0) {
if (list != NULL && list->getActor() != NULL && list->mType == fopAc_Attn_TYPE_TALK_e && LockonTruth()) {
fopAc_ac_c* actor = list->getActor();
if (actor->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
s16 rt;
@@ -167,7 +167,7 @@ dAttList_c* dAttention_c::getActionBtnXYZ_local(int button) {
return NULL;
for (i = 0; i < mActionNum; i++) {
if (mActionList[i].mType == 3) {
if (mActionList[i].mType == fopAc_Attn_TYPE_SPEAK_e) {
fopAc_ac_c* actor = mActionList[i].getActor();
if (actor->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
s16 rt;