various cleanup, fix some fakematches

2026-08-18 05:08:57 -04:00 · 2024-02-10 01:09:51 -05:00
parent 7c983ef0c7
commit deb7faebbf
14 changed files with 57 additions and 49 deletions
@@ -1173,11 +1173,10 @@ BOOL daItem_c::checkGetItem() {
    if (mCyl.ChkTgHit()) {
        cCcD_Obj* hitObj = mCyl.GetTgHitObj();
        if (hitObj) {
-            u32 atType = hitObj->GetAtType();
-            if (atType & AT_TYPE_SWORD) {
+            if (hitObj->ChkAtType(AT_TYPE_SWORD)) {
                itemGetExecute();
                return TRUE;
-            } else if (atType & AT_TYPE_BOOMERANG) {
+            } else if (hitObj->ChkAtType(AT_TYPE_BOOMERANG)) {
                setFlag(FLAG_BOOMERANG);
            }
        }