AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix std::make_pair fail (why is it even a problem?)

Browse Source 
Add CScriptPickup loader
This commit is contained in:
Phillip Stephens
2016-05-12 20:13:34 -07:00
parent 62b404152f
commit 236da3ac6e
9 changed files with 102 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/DNAMP3/ANIM.cpp
View File

@@ -461,7 +461,7 @@ void ANIM::ANIM1::read(athena::io::IStreamReader& reader)
for (atUint8 f=0 ; f<boneFlagCount ; ++f)
{
atUint8 flag = reader.readUByte();
bones.emplace_back(f, std::make_tuple(flag & 0x1, flag & 0x2, flag & 0x4));
bones.emplace_back(f, std::make_tuple(bool(flag & 0x1), bool(flag & 0x2), bool(flag & 0x4)));
if (flag & 0x1)
++boneChannelCount;
if (flag & 0x2)