mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 06:15:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)

Browse Source 
* d_k_wmark / d_k_wpillar OK

* make debug buildable / add assert functionality

* add more fop actor enums

* remove asm
This commit is contained in:
TakaRikka
2023-09-28 12:01:42 -07:00
committed by GitHub
parent 673e69386a
commit 89ed2b8a26
206 changed files with 1612 additions and 2472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_attention.cpp
+2 -2
View File
@@ -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];
}
}