gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21177) -Codechange: change UniqueLanguageFile into GetLanguage

Browse Source
This commit is contained in:
rubidium 2010-11-13 19:10:30 +00:00
parent 46cdc7b3d3
commit 034eb834cc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/language.h
View File

@ -103,5 +103,6 @@ extern LanguageList _languages;
extern const LanguageMetadata *_current_language; extern const LanguageMetadata *_current_language;
bool ReadLanguagePack(const LanguageMetadata *lang); bool ReadLanguagePack(const LanguageMetadata *lang);
const LanguageMetadata *GetLanguage(byte newgrflangid);
#endif /* LANGUAGE_H */ #endif /* LANGUAGE_H */

14
src/strings.cpp
View File

@ -1443,17 +1443,17 @@ int CDECL StringIDSorter(const StringID *a, const StringID *b)
} }
/** /**
* Checks whether the given language is already found. * Get the language with the given NewGRF language ID.
* @param newgrflangid NewGRF languages ID to check * @param newgrflangid NewGRF languages ID to check.
* @return true if and only if a language file with the same language ID has not been found * @return The language's metadata, or NULL if it is not known.
*/ */
static bool UniqueLanguageFile(byte newgrflangid) const LanguageMetadata *GetLanguage(byte newgrflangid)
{ {
for (const LanguageMetadata *lang = _languages.Begin(); lang != _languages.End(); lang++) { for (const LanguageMetadata *lang = _languages.Begin(); lang != _languages.End(); lang++) {
if (newgrflangid == lang->newgrflangid) return false; if (newgrflangid == lang->newgrflangid) return lang;
} }
return true; return NULL;
} }
/** /**
@ -1499,7 +1499,7 @@ static void GetLanguageList(const char *path)
/* Check whether the file is of the correct version */ /* Check whether the file is of the correct version */
if (!GetLanguageFileHeader(lmd.file, &lmd)) { if (!GetLanguageFileHeader(lmd.file, &lmd)) {
DEBUG(misc, 3, "%s is not a valid language file", lmd.file); DEBUG(misc, 3, "%s is not a valid language file", lmd.file);
} else if (!UniqueLanguageFile(lmd.newgrflangid)) { } else if (GetLanguage(lmd.newgrflangid) != NULL) {
DEBUG(misc, 3, "%s's language ID is already known", lmd.file); DEBUG(misc, 3, "%s's language ID is already known", lmd.file);
} else { } else {
*_languages.Append() = lmd; *_languages.Append() = lmd;