mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-20 13:09:15 +00:00
Code Issues Activity

(svn r24022) -Add: CARGO_LIST control code for strings

Browse Source
This commit is contained in:
rubidium
2012-03-10 19:04:49 +00:00
parent b65c2def5c
commit 19923e81f9
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/strings.cpp
View File

@@ -1106,6 +1106,38 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
break;
}
case SCC_CARGO_LIST: { // {CARGO_LIST}
uint32 cmask = args->GetInt32(SCC_CARGO_LIST);
bool first = true;
const CargoSpec *cs;
FOR_ALL_SORTED_CARGOSPECS(cs) {
if (!HasBit(cmask, cs->Index())) continue;
if (buff >= last - 2) break; // ',' and ' '
if (first) {
first = false;
} else {
/* Add a comma if this is not the first item */
*buff++ = ',';
*buff++ = ' ';
}
buff = GetStringWithArgs(buff, cs->name, args, last, next_substr_case_index, game_script);
}
/* If first is still true then no cargo is accepted */
if (first) buff = GetStringWithArgs(buff, STR_JUST_NOTHING, args, last, next_substr_case_index, game_script);
*buff = '\0';
next_substr_case_index = 0;
/* Make sure we detect any buffer overflow */
assert(buff < last);
break;
}
case SCC_CURRENCY_SHORT: // {CURRENCY_SHORT}
buff = FormatGenericCurrency(buff, _currency, args->GetInt64(), true, last);
break;