diff options
Diffstat (limited to 'src/KingSystem/Resource/Actor/resResourceActorLink.cpp')
| -rw-r--r-- | src/KingSystem/Resource/Actor/resResourceActorLink.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceActorLink.cpp b/src/KingSystem/Resource/Actor/resResourceActorLink.cpp index d941d417..7fdef88a 100644 --- a/src/KingSystem/Resource/Actor/resResourceActorLink.cpp +++ b/src/KingSystem/Resource/Actor/resResourceActorLink.cpp @@ -42,6 +42,8 @@ ActorLink::ActorLink() : ParamIO("xml", 0) { addObj(&mUsers.obj, "LinkTarget"); } +// getResParameter (redundant uxtw; i and res increment order) +#ifdef NON_MATCHING bool ActorLink::parse_(u8* data, size_t, sead::Heap* heap) { if (!data) return true; @@ -50,7 +52,7 @@ bool ActorLink::parse_(u8* data, size_t, sead::Heap* heap) { const auto root = archive.getRootList(); const s32 tags_idx = root.searchObjIndex(agl::utl::ParameterBase::calcHash("Tags")); - // NON_MATCHING: getResParameter (redundant uxtw; i and res increment order) + const auto parse_tags = [&] { if (tags_idx == -1) return; @@ -79,6 +81,7 @@ bool ActorLink::parse_(u8* data, size_t, sead::Heap* heap) { applyResParameterArchive(agl::utl::ResParameterArchive{data}); return true; } +#endif void ActorLink::finalize_() { if (!mTags.isBufferReady()) @@ -91,10 +94,12 @@ void ActorLink::finalize_() { mTags.freeBuffer(); } -// NON_MATCHING: operands are swapped for an equality comparison in binarySearch +// operands are swapped for an equality comparison in binarySearch +#ifdef NON_MATCHING bool ActorLink::hasTag(const char* tag_name) const { return mTags.size() >= 1 && mTags.binarySearch(sead::HashCRC32::calcStringHash(tag_name)) != -1; } +#endif bool ActorLink::hasTag(u32 tag) const { return mTags.size() >= 1 && mTags.binarySearch(tag) != -1; |