MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split loading of MPQs to handle translations and voice packs (#3922)

Browse source
This commit is contained in:
Andrew James 2022-01-08 19:15:39 +11:00 • committed by GitHub
commit d3aedf5df1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Source/init.cpp
View file

@ -60,13 +60,13 @@ std::optional<MpqArchive> font_mpq;
namespace {
std::optional<MpqArchive> LoadMPQ(const std::vector<std::string> &paths, const char *mpqName)
std::optional<MpqArchive> LoadMPQ(const std::vector<std::string> &paths, string_view mpqName)
{
std::optional<MpqArchive> archive;
std::string mpqAbsPath;
std::int32_t error = 0;
for (const auto &path : paths) {
mpqAbsPath = path + mpqName;
mpqAbsPath = path + mpqName.data();
if ((archive = MpqArchive::Open(mpqAbsPath.c_str(), error))) {
LogVerbose(" Found: {} in {}", mpqName, path);
paths::SetMpqDir(path);
@ -125,18 +125,6 @@ std::vector<std::string> GetMPQSearchPaths()
return paths;
}
void init_language_archives(const std::vector<std::string> &paths)
{
string_view code = *sgOptions.Language.code;
if (code != "en") {
char langMpqName[10] = {};
CopyUtf8(langMpqName, code.data(), sizeof(langMpqName));
strncat(langMpqName, ".mpq", sizeof(langMpqName) - strlen(langMpqName) - 1);
lang_mpq = LoadMPQ(paths, langMpqName);
}
}
} // namespace
void init_cleanup()
@ -160,7 +148,7 @@ void init_cleanup()
NetClose();
}
void init_archives()
void LoadCoreArchives()
{
auto paths = GetMPQSearchPaths();
@ -169,8 +157,25 @@ void init_archives()
devilutionx_mpq = LoadMPQ(paths, "devilutionx.mpq");
#endif
font_mpq = LoadMPQ(paths, "fonts.mpq"); // Extra fonts
}
init_language_archives(paths);
void LoadLanguageArchive()
{
lang_mpq = std::nullopt;
string_view code = *sgOptions.Language.code;
if (code != "en") {
std::string langMpqName { code };
langMpqName.append(".mpq");
auto paths = GetMPQSearchPaths();
lang_mpq = LoadMPQ(paths, langMpqName);
}
}
void LoadGameArchives()
{
auto paths = GetMPQSearchPaths();
diabdat_mpq = LoadMPQ(paths, "DIABDAT.MPQ");
if (!diabdat_mpq) {
@ -212,12 +217,6 @@ void init_archives()
}
}
void init_language_archives()
{
lang_mpq = std::nullopt;
init_language_archives(GetMPQSearchPaths());
}
void init_create_window()
{
if (!SpawnWindow(PROJECT_NAME))