ksys/act: Don't use Tag as argument as it causes matching diffs

And fairly stupid diffs for that matter, like an additional mov w1, w1
instruction that shouldn't exist
This commit is contained in:
Léo Lam
2020-12-02 18:49:05 +01:00
parent 581b3ef144
commit 3559c31bc9
5 changed files with 5 additions and 5 deletions
+1
View File
@@ -1,5 +1,6 @@
#include "Game/DLC/aoc2.h"
#include <math/seadMathCalcCommon.h>
#include "KingSystem/ActorSystem/actTag.h"
#include "KingSystem/Utils/InitTimeInfo.h"
namespace uking {
@@ -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;
@@ -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;
}
@@ -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<u32>& getTags() const { return mTags; }