falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -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

Can't render this file because it is too large.

1
src/Game/DLC/aoc2.cpp
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 {

3
src/KingSystem/ActorSystem/actActorConstDataAccess.h
View File

@ -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;

2
src/KingSystem/Resource/resResourceActorLink.cpp
View File

@ -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;
}

2
src/KingSystem/Resource/resResourceActorLink.h
View File

@ -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; }