dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::string for LanguageMetadata::file

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-05 22:21:02 +00:00
parent a573d065e1
commit 0460b820f3
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/strings.cpp
View File

@@ -2404,13 +2404,14 @@ static void GetLanguageList(const char *path)
if (extension == nullptr || strcmp(extension, ".lng") != 0) continue;
LanguageMetadata lmd;
seprintf(lmd.file, lastof(lmd.file), "%s%s", path, d_name.c_str());
lmd.file = path;
lmd.file += d_name;
/* Check whether the file is of the correct version */
if (!GetLanguageFileHeader(lmd.file, &lmd)) {
DEBUG(misc, 3, "%s is not a valid language file", lmd.file);
if (!GetLanguageFileHeader(lmd.file.c_str(), &lmd)) {
DEBUG(misc, 3, "%s is not a valid language file", lmd.file.c_str());
} else if (GetLanguage(lmd.newgrflangid) != nullptr) {
DEBUG(misc, 3, "%s's language ID is already known", lmd.file);
DEBUG(misc, 3, "%s's language ID is already known", lmd.file.c_str());
} else {
_languages.push_back(lmd);
}