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

Fixed character type mismatch.

This commit is contained in:
Jcw87 2020-02-15 12:24:50 -08:00
parent f251c73e6a
commit 7be3f4febb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataSpec/SpecBase.cpp
View File

@ -320,12 +320,12 @@ void SpecBase::flattenDependenciesBlend(const hecl::ProjectPath& in, std::vector
for (const auto& overlay : sub.overlayMeshes) { for (const auto& overlay : sub.overlayMeshes) {
hecl::SystemStringConv overlaySys(overlay.name); hecl::SystemStringConv overlaySys(overlay.name);
hecl::SystemStringConv overlayCskrId(overlay.cskrId);
if (hecl::IsPathBlend(overlay.mesh)) { if (hecl::IsPathBlend(overlay.mesh)) {
flattenDependenciesBlend(overlay.mesh, pathsOut, btok); flattenDependenciesBlend(overlay.mesh, pathsOut, btok);
pathsOut.push_back(overlay.mesh); pathsOut.push_back(overlay.mesh);
} }
pathsOut.push_back(asGlob.ensureAuxInfo( pathsOut.push_back(asGlob.ensureAuxInfo(fmt::format(fmt(_SYS_STR("{}.{}_{}.CSKR")), chSysName, overlaySys, overlayCskrId)));
fmt::format(fmt(_SYS_STR("{}.{}_{}.CSKR")), chSysName, overlaySys, overlay.cskrId)));
} }
} }
}; };
@ -342,8 +342,8 @@ void SpecBase::flattenDependenciesBlend(const hecl::ProjectPath& in, std::vector
} }
hecl::SystemStringConv chSysName(att.name); hecl::SystemStringConv chSysName(att.name);
pathsOut.push_back( hecl::SystemStringConv sysCskrId(att.cskrId);
asGlob.ensureAuxInfo(fmt::format(fmt(_SYS_STR("ATTACH.{}_{}.CSKR")), chSysName, att.cskrId))); pathsOut.push_back(asGlob.ensureAuxInfo(fmt::format(fmt(_SYS_STR("ATTACH.{}_{}.CSKR")), chSysName, sysCskrId)));
if (att.armature >= 0) { if (att.armature >= 0) {
const auto& arm = actor.armatures[att.armature]; const auto& arm = actor.armatures[att.armature];