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

CStringTable and CRasterFont fixes

Browse Source
This commit is contained in:
Phillip Stephens
2016-08-16 22:40:25 -07:00
parent 13cb48e3f9
commit fd26dd56c3
5 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
DataSpec/DNAMP1/STRG.cpp
View File

@@ -6,30 +6,51 @@ namespace DataSpec
namespace DNAMP1
{
const std::vector<FourCC> skLanguages =
{
FOURCC('ENGL'),
FOURCC('FREN'),
FOURCC('GERM'),
FOURCC('SPAN'),
FOURCC('ITAL'),
FOURCC('DUTC'),
FOURCC('JAPN')
};
void STRG::_read(athena::io::IStreamReader& reader)
{
atUint32 langCount = reader.readUint32Big();
atUint32 strCount = reader.readUint32Big();
std::vector<FourCC> readLangs;
std::vector<std::pair<FourCC, atUint32>> readLangs;
readLangs.reserve(langCount);
for (atUint32 l=0 ; l<langCount ; ++l)
{
DNAFourCC lang;
lang.read(reader);
readLangs.emplace_back(lang);
reader.seek(4);
atUint32 off = reader.readUint32Big();
readLangs.emplace_back(lang, off);
}
atUint32 tablesStart = reader.position();
langs.clear();
langs.reserve(langCount);
for (FourCC& lang : readLangs)
langs.reserve(skLanguages.size());
for (const std::pair<FourCC, atUint32>& lang : readLangs)
{
std::vector<std::wstring> strs;
reader.seek(strCount * 4 + 4);
reader.seek(tablesStart + lang.second, athena::SeekOrigin::Begin);
reader.readUint32Big(); // table size
atUint32 langStart = reader.position();
for (atUint32 s=0 ; s<strCount ; ++s)
{
atUint32 strOffset = reader.readUint32Big();
atUint32 tmpOffset = reader.position();
reader.seek(langStart + strOffset, athena::SeekOrigin::Begin);
strs.emplace_back(reader.readWStringBig());
langs.emplace_back(lang, strs);
reader.seek(tmpOffset, athena::SeekOrigin::Begin);
}
langs.emplace_back(lang.first, strs);
}
langMap.clear();
@@ -70,7 +91,7 @@ void STRG::write(athena::io::IStreamWriter& writer) const
{
atUint32 chCount = lang.second[s].size();
if (s < langStrCount)
offset += chCount * 2 + 1;
offset += (chCount + 1) * 2;
else
offset += 1;
}
@@ -83,7 +104,7 @@ void STRG::write(athena::io::IStreamWriter& writer) const
for (atUint32 s=0 ; s<strCount ; ++s)
{
if (s < langStrCount)
tableSz += lang.second[s].size() * 2 + 1;
tableSz += (lang.second[s].size() + 1) * 2;
else
tableSz += 1;
}
@@ -94,7 +115,7 @@ void STRG::write(athena::io::IStreamWriter& writer) const
{
writer.writeUint32Big(offset);
if (s < langStrCount)
offset += lang.second[s].size() * 2 + 1;
offset += (lang.second[s].size() + 1) * 2;
else
offset += 1;
}
@@ -140,6 +161,9 @@ void STRG::read(athena::io::YAMLDocReader& reader)
{
for (const auto& lang : root->m_mapChildren)
{
if (lang.first == "DNAType")
continue;
if (lang.first.size() != 4)
{
Log.report(logvisor::Warning, "STRG language string '%s' must be exactly 4 characters; skipping", lang.first.c_str());
@@ -170,6 +194,9 @@ void STRG::read(athena::io::YAMLDocReader& reader)
langs.clear();
for (const auto& lang : root->m_mapChildren)
{
if (lang.first == "DNAType")
continue;
std::vector<std::wstring> strs;
for (const auto& str : lang.second->m_seqChildren)
strs.emplace_back(hecl::UTF8ToWide(str->m_scalarString));

9
DataSpec/SpecMP1.cpp
View File

@@ -10,6 +10,7 @@
#include "DNAMP1/CMDL.hpp"
#include "DNAMP1/MREA.hpp"
#include "DNAMP1/ANCS.hpp"
#include "DNACommon/FONT.hpp"
#include "DNACommon/PART.hpp"
#include "DNACommon/SWHC.hpp"
#include "DNACommon/ELSC.hpp"
@@ -343,6 +344,8 @@ struct SpecMP1 : SpecBase
return true;
else if (!strcmp(classType, DNADGRP::DGRP<UniqueID32>::DNAType()))
return true;
else if (!strcmp(classType, DNAFont::FONT<UniqueID32>::DNAType()))
return true;
return false;
});
}
@@ -477,6 +480,12 @@ struct SpecMP1 : SpecBase
dgrp.read(reader);
DNADGRP::WriteDGRP(dgrp, out);
}
else if (!classStr.compare(DNAFont::FONT<UniqueID32>::DNAType()))
{
DNAFont::FONT<UniqueID32> font;
font.read(reader);
DNAFont::WriteFONT(font, out);
}
}
progress(_S("Done"));
}