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

GCN image generation fixes

This commit is contained in:
Jack Andersen 2016-01-21 10:46:07 -10:00
parent fafff92874
commit 3fab04ff1a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver/main.cpp
View File

@ -93,7 +93,10 @@ int main(int argc, char* argv[])
lastIdx = idx; lastIdx = idx;
printf("\n"); printf("\n");
} }
printf("\r%s %" PRISize " B", name.c_str(), bytes); if (bytes != -1)
printf("\r%s %" PRISize " B", name.c_str(), bytes);
else
printf("\r%s", name.c_str());
fflush(stdout); fflush(stdout);
}; };

4
lib/DiscBase.cpp
View File

@ -167,7 +167,7 @@ void DiscBuilderBase::IPartitionBuilder::recursiveBuildNodes(const SystemChar* d
if (e.m_isDir) if (e.m_isDir)
{ {
size_t dirNodeIdx = m_buildNodes.size(); size_t dirNodeIdx = m_buildNodes.size();
m_buildNodes.emplace_back(true, m_buildNameOff, 0, 1); m_buildNodes.emplace_back(true, m_buildNameOff, 0, dirNodeIdx+1);
addBuildName(e.m_name); addBuildName(e.m_name);
incParents(); incParents();
recursiveBuildNodes(e.m_path.c_str(), dolInode, [&](){m_buildNodes[dirNodeIdx].incrementLength(); incParents();}); recursiveBuildNodes(e.m_path.c_str(), dolInode, [&](){m_buildNodes[dirNodeIdx].incrementLength(); incParents();});
@ -213,6 +213,8 @@ bool DiscBuilderBase::IPartitionBuilder::buildFromDirectory(const SystemChar* di
/* Clear file */ /* Clear file */
m_parent.getFileIO().beginWriteStream(); m_parent.getFileIO().beginWriteStream();
++m_parent.m_progressIdx;
m_parent.m_progressCB(m_parent.m_progressIdx, "Preparing output image", -1);
m_buildNodes.emplace_back(true, m_buildNameOff, 0, 1); m_buildNodes.emplace_back(true, m_buildNameOff, 0, 1);
addBuildName(_S("<root>")); addBuildName(_S("<root>"));

1
lib/DiscGCN.cpp
View File

@ -165,6 +165,7 @@ public:
size_t fstSz = sizeof(FSTNode) * m_buildNodes.size(); size_t fstSz = sizeof(FSTNode) * m_buildNodes.size();
for (size_t i=0 ; i<fstOff-xferSz ; ++i) for (size_t i=0 ; i<fstOff-xferSz ; ++i)
ws->write("\xff", 1); ws->write("\xff", 1);
fstOff += 0x2440;
ws->write(m_buildNodes.data(), fstSz); ws->write(m_buildNodes.data(), fstSz);
for (const std::string& str : m_buildNames) for (const std::string& str : m_buildNames)
ws->write(str.data(), str.size()+1); ws->write(str.data(), str.size()+1);