diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-09-28 12:01:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 12:01:42 -0700 |
| commit | 84e413505363e1c2fcef6c559bcc24037d340a38 (patch) | |
| tree | e02ca80d735ad4dd36b930a43dccbbf566812a34 /src/d/d_attention.cpp | |
| parent | 9b4c375741a77037358e28e4f431bbc5adde94f7 (diff) | |
k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)
* d_k_wmark / d_k_wpillar OK
* make debug buildable / add assert functionality
* add more fop actor enums
* remove asm
Diffstat (limited to 'src/d/d_attention.cpp')
| -rw-r--r-- | src/d/d_attention.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index f7f50a5b64..9758510705 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -524,7 +524,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { dAttList_c* list = GetLockonList(0); if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth()) { - if (list->getActor()->mEvtInfo.chkCondition(0x20)) { + if (list->getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return list; } @@ -537,7 +537,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { for (i = 0; i < mActionCount; i++) { if (mActionList[i].mType == 3) { - if (mActionList[i].getActor()->mEvtInfo.chkCondition(0x20)) { + if (mActionList[i].getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return &mActionList[i]; } } |