amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 20:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make Subdirectory a scoped enum

Browse Source
This commit is contained in:
Peter Nelson
2026-04-05 21:46:07 +01:00
committed by Peter Nelson
parent 93a6aa77c6
commit 5aae8e2d64
52 changed files with 218 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_text.cpp
+4 -4
View File
@@ -49,7 +49,7 @@ void CDECL StrgenFatalI(const std::string &msg)
LanguageStrings ReadRawLanguageStrings(const std::string &file)
{
size_t to_read;
auto fh = FioFOpenFile(file, "rb", GAME_DIR, &to_read);
auto fh = FioFOpenFile(file, "rb", Subdirectory::Gs, &to_read);
if (!fh.has_value()) return LanguageStrings();
auto pos = file.rfind(PATHSEPCHAR);
@@ -212,7 +212,7 @@ static std::shared_ptr<GameStrings> LoadTranslations()
basename.erase(e + 1);
std::string filename = basename + "lang" PATHSEP "english.txt";
if (!FioCheckFileExists(filename, GAME_DIR)) return nullptr;
if (!FioCheckFileExists(filename, Subdirectory::Gs)) return nullptr;
auto ls = ReadRawLanguageStrings(filename);
if (!ls.IsValid()) return nullptr;
@@ -227,10 +227,10 @@ static std::shared_ptr<GameStrings> LoadTranslations()
const std::string tar_filename = info->GetTarFile();
TarList::iterator iter;
if (!tar_filename.empty() && (iter = _tar_list[GAME_DIR].find(tar_filename)) != _tar_list[GAME_DIR].end()) {
if (!tar_filename.empty() && (iter = _tar_list[Subdirectory::Gs].find(tar_filename)) != _tar_list[Subdirectory::Gs].end()) {
/* The main script is in a tar file, so find all files that
* are in the same tar and add them to the langfile scanner. */
for (const auto &[name, entry] : _tar_filelist[GAME_DIR]) {
for (const auto &[name, entry] : _tar_filelist[Subdirectory::Gs]) {
/* Not in the same tar. */
if (entry.tar_filename != iter->first) continue;