Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24522) -Codechange: Rename _keep_gender_data to _scan_for_gender_data to reflect what it intends to do instead of what it does.

Browse Source
This commit is contained in:
frosch 2012-09-12 18:50:44 +00:00
parent 9966ebf3c9
commit aee89afb55
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/strings.cpp
View File

@ -132,7 +132,7 @@ static char **_langpack_offs;
static LanguagePack *_langpack; static LanguagePack *_langpack;
static uint _langtab_num[TAB_COUNT]; ///< Offset into langpack offs static uint _langtab_num[TAB_COUNT]; ///< Offset into langpack offs
static uint _langtab_start[TAB_COUNT]; ///< Offset into langpack offs static uint _langtab_start[TAB_COUNT]; ///< Offset into langpack offs
static bool _keep_gender_data = false; ///< Should we retain the gender data in the current string? static bool _scan_for_gender_data = false; ///< Are we scanning for the gender of the current string? (instead of formatting it)
const char *GetStringPtr(StringID string) const char *GetStringPtr(StringID string)
@ -879,11 +879,11 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
/* Now do the string formatting. */ /* Now do the string formatting. */
char buf[256]; char buf[256];
bool old_kgd = _keep_gender_data; bool old_sgd = _scan_for_gender_data;
_keep_gender_data = true; _scan_for_gender_data = true;
StringParameters tmp_params(args->GetPointerToOffset(offset), args->num_param - offset, NULL); StringParameters tmp_params(args->GetPointerToOffset(offset), args->num_param - offset, NULL);
p = FormatString(buf, input, &tmp_params, lastof(buf)); p = FormatString(buf, input, &tmp_params, lastof(buf));
_keep_gender_data = old_kgd; _scan_for_gender_data = old_sgd;
*p = '\0'; *p = '\0';
/* And determine the string. */ /* And determine the string. */
@ -899,7 +899,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
/* This sets up the gender for the string. /* This sets up the gender for the string.
* We just ignore this one. It's used in {G 0 Der Die Das} to determine the case. */ * We just ignore this one. It's used in {G 0 Der Die Das} to determine the case. */
case SCC_GENDER_INDEX: // {GENDER 0} case SCC_GENDER_INDEX: // {GENDER 0}
if (_keep_gender_data) { if (_scan_for_gender_data) {
buff += Utf8Encode(buff, SCC_GENDER_INDEX); buff += Utf8Encode(buff, SCC_GENDER_INDEX);
*buff++ = *str++; *buff++ = *str++;
} else { } else {