diff options
| author | rubidium <rubidium@openttd.org> | 2011-12-17 23:16:16 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-12-17 23:16:16 +0000 |
| commit | 50b63c587087733b2d3b059e10a10eba748c0166 (patch) | |
| tree | 1f004d4165d0434bf51e5f848d566e063a4b33af /src/strgen/strgen_base.cpp | |
| parent | 89c263c2df3f7d457716ae5cc8c5cf0e8eb7d520 (diff) | |
| download | openttd-50b63c587087733b2d3b059e10a10eba748c0166.tar.xz | |
(svn r23585) -Codechange: replace some magic numbers with less magic constants
Diffstat (limited to 'src/strgen/strgen_base.cpp')
| -rw-r--r-- | src/strgen/strgen_base.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp index 98e5aefb1..5563de31e 100644 --- a/src/strgen/strgen_base.cpp +++ b/src/strgen/strgen_base.cpp @@ -89,7 +89,7 @@ void LangString::FreeTranslation() * Create a new string data container. * @param max_strings The maximum number of strings. */ -StringData::StringData(size_t tabs) : tabs(tabs), max_strings(tabs * STRINGS_IN_TAB) +StringData::StringData(size_t tabs) : tabs(tabs), max_strings(tabs * TAB_SIZE) { this->strings = CallocT<LangString *>(max_strings); this->hash_heads = CallocT<uint16>(max_strings); @@ -215,7 +215,7 @@ uint StringData::Version() const uint StringData::CountInUse(uint tab) const { int i; - for (i = STRINGS_IN_TAB; --i >= 0;) if (this->strings[(tab * STRINGS_IN_TAB) + i] != NULL) break; + for (i = TAB_SIZE; --i >= 0;) if (this->strings[(tab * TAB_SIZE) + i] != NULL) break; return i + 1; } @@ -938,7 +938,7 @@ void LanguageWriter::WriteLang(const StringData &data) _lang.offsets[tab] = TO_LE16(n); for (uint j = 0; j != in_use[tab]; j++) { - const LangString *ls = data.strings[(tab * StringData::STRINGS_IN_TAB) + j]; + const LangString *ls = data.strings[(tab * TAB_SIZE) + j]; if (ls != NULL && ls->translated == NULL) _lang.missing++; } } @@ -953,7 +953,7 @@ void LanguageWriter::WriteLang(const StringData &data) for (size_t tab = 0; tab < data.tabs; tab++) { for (uint j = 0; j != in_use[tab]; j++) { - const LangString *ls = data.strings[(tab * StringData::STRINGS_IN_TAB) + j]; + const LangString *ls = data.strings[(tab * TAB_SIZE) + j]; const Case *casep; const char *cmdp; |