AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:47:46 +00:00
Code Issues Projects Releases Wiki Activity

RetroDataSpec: Use override where applicable

Browse Source 
Continues the override modernizations, applying the keyword where
applicable to the RetroDataSpec target.
This commit is contained in:
Lioncash
2019-08-09 22:32:48 -04:00
parent 1e625e0995
commit a5a2516138
101 changed files with 1230 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DataSpec/DNAMP3/CHAR.hpp
View File

@@ -135,7 +135,7 @@ struct CHAR : BigDNA {
Value<float> unk1;
Value<atUint32> unk2;
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) {
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) override {
out[animIdx] = {animName, animId, UniqueID64(), false};
}
};
@@ -148,7 +148,7 @@ struct CHAR : BigDNA {
Value<float> unkFloat;
Value<atUint8> unk;
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) {
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) override {
animA.m_anim->gatherPrimitives(out);
animB.m_anim->gatherPrimitives(out);
}
@@ -162,7 +162,7 @@ struct CHAR : BigDNA {
Value<float> unkFloat;
Value<atUint8> unk;
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) {
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) override {
animA.m_anim->gatherPrimitives(out);
animB.m_anim->gatherPrimitives(out);
}
@@ -179,7 +179,7 @@ struct CHAR : BigDNA {
};
Vector<Child, AT_DNA_COUNT(animCount)> children;
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) {
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) override {
for (const auto& child : children)
child.anim.m_anim->gatherPrimitives(out);
}
@@ -191,7 +191,7 @@ struct CHAR : BigDNA {
Value<atUint32> animCount;
Vector<MetaAnimFactory, AT_DNA_COUNT(animCount)> children;
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) {
void gatherPrimitives(std::map<atUint32, DNAANCS::AnimationResInfo<UniqueID64>>& out) override {
for (const auto& child : children)
child.m_anim->gatherPrimitives(out);
}