AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use base ID where needed

This commit is contained in:
Jack Andersen 2016-04-05 16:16:27 -10:00
parent 8f4cc0876e
commit 234573938a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataSpec/DNAMP1/ANCS.hpp
View File

@ -569,11 +569,11 @@ struct ANCS : BigYAML
DNAANCS::CharacterResInfo<UniqueID32>& chOut = out.back(); DNAANCS::CharacterResInfo<UniqueID32>& chOut = out.back();
chOut.name = ci.name; chOut.name = ci.name;
chOut.cmdl = ci.cmdl; chOut.cmdl = ci.cmdl;
chOut.cskr = ci.cskr; chOut.cskr = ci.cskr.getBaseId();
chOut.cinf = ci.cinf; chOut.cinf = ci.cinf.getBaseId();
if (ci.cmdlOverlay) if (ci.cmdlOverlay)
chOut.overlays.emplace_back(FOURCC('OVER'), std::make_pair(ci.cmdlOverlay, ci.cskrOverlay)); chOut.overlays.emplace_back(FOURCC('OVER'), std::make_pair(ci.cmdlOverlay, ci.cskrOverlay.getBaseId()));
} }
} }

6
DataSpec/DNAMP2/ANCS.hpp
View File

@ -201,11 +201,11 @@ struct ANCS : BigYAML
DNAANCS::CharacterResInfo<UniqueID32>& chOut = out.back(); DNAANCS::CharacterResInfo<UniqueID32>& chOut = out.back();
chOut.name = ci.name; chOut.name = ci.name;
chOut.cmdl = ci.cmdl; chOut.cmdl = ci.cmdl;
chOut.cskr = ci.cskr; chOut.cskr = ci.cskr.getBaseId();
chOut.cinf = ci.cinf; chOut.cinf = ci.cinf.getBaseId();
if (ci.cmdlOverlay) if (ci.cmdlOverlay)
chOut.overlays.emplace_back(FOURCC('OVER'), std::make_pair(ci.cmdlOverlay, ci.cskrOverlay)); chOut.overlays.emplace_back(FOURCC('OVER'), std::make_pair(ci.cmdlOverlay, ci.cskrOverlay.getBaseId()));
} }
} }