gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23297) -Add: {CARGO_TINY} (Rubidium)

Browse Source
This commit is contained in:
truebrain 2011-11-23 16:04:28 +00:00
parent 389ffec7db
commit 4e09cde649
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/strings.cpp
View File

@ -912,6 +912,31 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg
buff = FormatBytes(buff, args->GetInt64(), last); buff = FormatBytes(buff, args->GetInt64(), last);
break; break;
case SCC_CARGO_TINY: { // {CARGO_TINY}
/* Tiny description of cargotypes. Layout:
* param 1: cargo type
* param 2: cargo count */
StringID cargo_str = CargoSpec::Get(args->GetInt32(SCC_CARGO_SHORT))->units_volume;
int64 amount = 0;
switch (cargo_str) {
case STR_TONS:
amount = _units[_settings_game.locale.units].c_weight.ToDisplay(args->GetInt64());
break;
case STR_LITERS:
amount = _units[_settings_game.locale.units].c_volume.ToDisplay(args->GetInt64());
break;
default: {
amount = args->GetInt64();
break;
}
}
buff = FormatCommaNumber(buff, amount, last);
break;
}
case SCC_CARGO_SHORT: { // {CARGO_SHORT} case SCC_CARGO_SHORT: { // {CARGO_SHORT}
/* Short description of cargotypes. Layout: /* Short description of cargotypes. Layout:
* param 1: cargo type * param 1: cargo type

1
src/table/control_codes.h
View File

@ -50,6 +50,7 @@ enum StringControlCode {
SCC_CARGO_LONG, SCC_CARGO_LONG,
SCC_CARGO_SHORT, SCC_CARGO_SHORT,
SCC_CARGO_TINY,
SCC_POWER, SCC_POWER,
SCC_VOLUME_LONG, SCC_VOLUME_LONG,
SCC_VOLUME_SHORT, SCC_VOLUME_SHORT,

1
src/table/strgen_tables.h
View File

@ -69,6 +69,7 @@ static const CmdStruct _cmd_structs[] = {
{"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, C_CASE | C_GENDER}, // industry, takes an industry #, can have cases {"INDUSTRY", EmitSingleChar, SCC_INDUSTRY_NAME, 1, C_CASE | C_GENDER}, // industry, takes an industry #, can have cases
{"CARGO_LONG", EmitSingleChar, SCC_CARGO_LONG, 2, C_NONE | C_GENDER}, {"CARGO_LONG", EmitSingleChar, SCC_CARGO_LONG, 2, C_NONE | C_GENDER},
{"CARGO_SHORT", EmitSingleChar, SCC_CARGO_SHORT, 2, C_NONE}, // short cargo description, only ### tons, or ### litres {"CARGO_SHORT", EmitSingleChar, SCC_CARGO_SHORT, 2, C_NONE}, // short cargo description, only ### tons, or ### litres
{"CARGO_TINY", EmitSingleChar, SCC_CARGO_TINY, 2, C_NONE}, // tiny cargo description with only the amount, not a specifier for the amount or the actual cargo name
{"POWER", EmitSingleChar, SCC_POWER, 1, C_NONE}, {"POWER", EmitSingleChar, SCC_POWER, 1, C_NONE},
{"VOLUME_LONG", EmitSingleChar, SCC_VOLUME_LONG, 1, C_NONE}, {"VOLUME_LONG", EmitSingleChar, SCC_VOLUME_LONG, 1, C_NONE},
{"VOLUME_SHORT", EmitSingleChar, SCC_VOLUME_SHORT, 1, C_NONE}, {"VOLUME_SHORT", EmitSingleChar, SCC_VOLUME_SHORT, 1, C_NONE},