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

MSVC fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-07-22 09:05:18 -10:00
parent a4d6e32e48
commit ec0c7de511
19 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DataSpec/DNAMP3/PAK.cpp
View File

@@ -67,7 +67,7 @@ void PAK::write(Athena::io::IStreamWriter& writer) const
FourCC("STRG").write(writer);
atUint32 strgSz = 4;
for (const NameEntry& entry : m_nameEntries)
strgSz += entry.name.size() + 13;
strgSz += (atUint32)entry.name.size() + 13;
atUint32 strgPad = ((strgSz + 63) & ~63) - strgSz;
strgSz += strgPad;
writer.writeUint32(strgSz);
@@ -88,12 +88,12 @@ void PAK::write(Athena::io::IStreamWriter& writer) const
writer.writeUint32(dataSz);
writer.seek(36, Athena::Current);
writer.writeUint32(m_nameEntries.size());
writer.writeUint32((atUint32)m_nameEntries.size());
for (const NameEntry& entry : m_nameEntries)
entry.write(writer);
writer.seek(strgPad, Athena::Current);
writer.writeUint32(m_entries.size());
writer.writeUint32((atUint32)m_entries.size());
for (const Entry& entry : m_entries)
{
Entry copy = entry;
@@ -125,8 +125,9 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const NOD::DiscBase::IPartition
{
atUint32 compSz;
atUint32 decompSz;
} blocks[head.blockCount];
strm->read(blocks, 8 * head.blockCount);
};
std::unique_ptr<Block[]> blocks(new Block[head.blockCount]);
strm->read(blocks.get(), 8 * head.blockCount);
atUint64 maxBlockSz = 0;
atUint64 totalDecompSz = 0;