Update to 1.10.0-beta1
This commit is contained in:
@@ -13,9 +13,9 @@
|
||||
#define LANGUAGE_H
|
||||
|
||||
#include "core/smallvec_type.hpp"
|
||||
#ifdef WITH_ICU_SORT
|
||||
#ifdef WITH_ICU_I18N
|
||||
#include <unicode/coll.h>
|
||||
#endif /* WITH_ICU_SORT */
|
||||
#endif /* WITH_ICU_I18N */
|
||||
#include "strings_type.h"
|
||||
|
||||
static const uint8 CASE_GENDER_LEN = 16; ///< The (maximum) length of a case/gender string.
|
||||
@@ -96,7 +96,7 @@ struct LanguageMetadata : public LanguagePackHeader {
|
||||
};
|
||||
|
||||
/** Type for the list of language meta data. */
|
||||
typedef SmallVector<LanguageMetadata, 4> LanguageList;
|
||||
typedef std::vector<LanguageMetadata> LanguageList;
|
||||
|
||||
/** The actual list of language meta data. */
|
||||
extern LanguageList _languages;
|
||||
@@ -104,9 +104,9 @@ extern LanguageList _languages;
|
||||
/** The currently loaded language. */
|
||||
extern const LanguageMetadata *_current_language;
|
||||
|
||||
#ifdef WITH_ICU_SORT
|
||||
#ifdef WITH_ICU_I18N
|
||||
extern icu::Collator *_current_collator;
|
||||
#endif /* WITH_ICU_SORT */
|
||||
#endif /* WITH_ICU_I18N */
|
||||
|
||||
bool ReadLanguagePack(const LanguageMetadata *lang);
|
||||
const LanguageMetadata *GetLanguage(byte newgrflangid);
|
||||
|
||||
Reference in New Issue
Block a user