diff --git a/data/uking_functions.csv b/data/uking_functions.csv index f0319b89..94cc814e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -90924,7 +90924,7 @@ 0x0000007101166f60,sub_7101166F60,124,_ZN4ksys3res9ActorLink9finalize_Ev 0x0000007101166fdc,sub_7101166FDC,124,_ZThn632_N4ksys3res9ActorLink9finalize_Ev 0x0000007101167058,Bxml::hasTagByName,164,_ZNK4ksys3res9ActorLink6hasTagEPKc -0x00000071011670fc,Bxml::hasTag,108,_ZNK4ksys3res9ActorLink6hasTagENS_3act3TagE? +0x00000071011670fc,Bxml::hasTag,108,_ZNK4ksys3res9ActorLink6hasTagEj 0x0000007101167168,sub_7101167168,236,_ZN4ksys3res9ActorLinkD2Ev 0x0000007101167254,sub_7101167254,224,_ZN4ksys3res9ActorLinkD0Ev 0x0000007101167334,sub_7101167334,8,_ZNK4ksys3res9ActorLink27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/DLC/aoc2.cpp b/src/Game/DLC/aoc2.cpp index ed21fe6b..9bb3d9b9 100644 --- a/src/Game/DLC/aoc2.cpp +++ b/src/Game/DLC/aoc2.cpp @@ -1,5 +1,6 @@ #include "Game/DLC/aoc2.h" #include +#include "KingSystem/ActorSystem/actTag.h" #include "KingSystem/Utils/InitTimeInfo.h" namespace uking { diff --git a/src/KingSystem/ActorSystem/actActorConstDataAccess.h b/src/KingSystem/ActorSystem/actActorConstDataAccess.h index 560954bb..48de7f10 100644 --- a/src/KingSystem/ActorSystem/actActorConstDataAccess.h +++ b/src/KingSystem/ActorSystem/actActorConstDataAccess.h @@ -2,7 +2,6 @@ #include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" #include "KingSystem/ActorSystem/actBaseProcLink.h" -#include "KingSystem/ActorSystem/actTag.h" #include "KingSystem/Utils/Types.h" namespace ksys::act { @@ -30,7 +29,7 @@ public: const sead::SafeString& getProfile() const; const sead::SafeString& getName() const; bool hasTag(const sead::SafeString& tag) const; - bool hasTag(Tag tag) const; + bool hasTag(u32 tag) const; u32 getId() const; bool acquireConnectedCalcParent(ActorLinkConstDataAccess* accessor) const; bool acquireConnectedCalcChild(ActorLinkConstDataAccess* accessor) const; diff --git a/src/KingSystem/Resource/resResourceActorLink.cpp b/src/KingSystem/Resource/resResourceActorLink.cpp index 9aebc366..a4cd1709 100644 --- a/src/KingSystem/Resource/resResourceActorLink.cpp +++ b/src/KingSystem/Resource/resResourceActorLink.cpp @@ -96,7 +96,7 @@ bool ActorLink::hasTag(const char* tag_name) const { return mTags.size() >= 1 && mTags.binarySearch(sead::HashCRC32::calcStringHash(tag_name)) != -1; } -bool ActorLink::hasTag(act::Tag tag) const { +bool ActorLink::hasTag(u32 tag) const { return mTags.size() >= 1 && mTags.binarySearch(tag) != -1; } diff --git a/src/KingSystem/Resource/resResourceActorLink.h b/src/KingSystem/Resource/resResourceActorLink.h index 7230d68f..0b2f017e 100644 --- a/src/KingSystem/Resource/resResourceActorLink.h +++ b/src/KingSystem/Resource/resResourceActorLink.h @@ -117,7 +117,7 @@ public: f32 getActorScale() const { return mActorScale.ref(); } bool hasTag(const char* tag_name) const; - bool hasTag(act::Tag tag) const; + bool hasTag(u32 tag) const; const sead::Buffer& getTags() const { return mTags; }