mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Include new cargo classes in dump cargo types console command

pull/13175/head
Jonathan G Rennison 2024-12-17 23:48:51 +00:00 committed by rubidium42
parent e78cd7d6e9
commit e3e3cb13c6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/console_cmds.cpp
View File

@ -2692,6 +2692,11 @@ static void ConDumpCargoTypes()
IConsolePrint(CC_DEFAULT, " r = refrigerated"); IConsolePrint(CC_DEFAULT, " r = refrigerated");
IConsolePrint(CC_DEFAULT, " h = hazardous"); IConsolePrint(CC_DEFAULT, " h = hazardous");
IConsolePrint(CC_DEFAULT, " c = covered/sheltered"); IConsolePrint(CC_DEFAULT, " c = covered/sheltered");
IConsolePrint(CC_DEFAULT, " o = oversized");
IConsolePrint(CC_DEFAULT, " d = powderized");
IConsolePrint(CC_DEFAULT, " n = not pourable");
IConsolePrint(CC_DEFAULT, " e = potable");
IConsolePrint(CC_DEFAULT, " i = non-potable");
IConsolePrint(CC_DEFAULT, " S = special"); IConsolePrint(CC_DEFAULT, " S = special");
std::map<uint32_t, const GRFFile *> grfs; std::map<uint32_t, const GRFFile *> grfs;
@ -2703,7 +2708,7 @@ static void ConDumpCargoTypes()
grfid = grf->grfid; grfid = grf->grfid;
grfs.emplace(grfid, grf); grfs.emplace(grfid, grf);
} }
IConsolePrint(CC_DEFAULT, " {:02d} Bit: {:2d}, Label: {}, Callback mask: 0x{:02X}, Cargo class: {}{}{}{}{}{}{}{}{}{}{}, GRF: {:08X}, {}", IConsolePrint(CC_DEFAULT, " {:02d} Bit: {:2d}, Label: {}, Callback mask: 0x{:02X}, Cargo class: {}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}, GRF: {:08X}, {}",
spec->Index(), spec->Index(),
spec->bitnum, spec->bitnum,
FormatLabel(spec->label.base()), FormatLabel(spec->label.base()),
@ -2718,6 +2723,11 @@ static void ConDumpCargoTypes()
(spec->classes & CC_REFRIGERATED) != 0 ? 'r' : '-', (spec->classes & CC_REFRIGERATED) != 0 ? 'r' : '-',
(spec->classes & CC_HAZARDOUS) != 0 ? 'h' : '-', (spec->classes & CC_HAZARDOUS) != 0 ? 'h' : '-',
(spec->classes & CC_COVERED) != 0 ? 'c' : '-', (spec->classes & CC_COVERED) != 0 ? 'c' : '-',
(spec->classes & CC_OVERSIZED) != 0 ? 'o' : '-',
(spec->classes & CC_POWDERIZED) != 0 ? 'd' : '-',
(spec->classes & CC_NOT_POURABLE) != 0 ? 'n' : '-',
(spec->classes & CC_POTABLE) != 0 ? 'e' : '-',
(spec->classes & CC_NON_POTABLE) != 0 ? 'i' : '-',
(spec->classes & CC_SPECIAL) != 0 ? 'S' : '-', (spec->classes & CC_SPECIAL) != 0 ? 'S' : '-',
BSWAP32(grfid), BSWAP32(grfid),
GetStringPtr(spec->name) GetStringPtr(spec->name)