update to 1.6.0
--HG-- branch : openttd
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $Id: language.h 23585 2011-12-17 23:16:16Z rubidium $ */
|
||||
/* $Id: language.h 27367 2015-08-09 12:33:27Z rubidium $ */
|
||||
|
||||
/*
|
||||
* This file is part of OpenTTD.
|
||||
@@ -13,9 +13,9 @@
|
||||
#define LANGUAGE_H
|
||||
|
||||
#include "core/smallvec_type.hpp"
|
||||
#ifdef WITH_ICU
|
||||
#ifdef WITH_ICU_SORT
|
||||
#include <unicode/coll.h>
|
||||
#endif /* WITH_ICU */
|
||||
#endif /* WITH_ICU_SORT */
|
||||
|
||||
static const uint8 CASE_GENDER_LEN = 16; ///< The (maximum) length of a case/gender string.
|
||||
static const uint8 MAX_NUM_GENDERS = 8; ///< Maximum number of supported genders.
|
||||
@@ -110,9 +110,9 @@ extern LanguageList _languages;
|
||||
/** The currently loaded language. */
|
||||
extern const LanguageMetadata *_current_language;
|
||||
|
||||
#ifdef WITH_ICU
|
||||
#ifdef WITH_ICU_SORT
|
||||
extern Collator *_current_collator;
|
||||
#endif /* WITH_ICU */
|
||||
#endif /* WITH_ICU_SORT */
|
||||
|
||||
bool ReadLanguagePack(const LanguageMetadata *lang);
|
||||
const LanguageMetadata *GetLanguage(byte newgrflangid);
|
||||
|
||||
Reference in New Issue
Block a user