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

(svn r18539) -Codechange: Re-use cargolist drawing in StationViewWindow::DrawAcceptedCargo()

release/1.0
alberth 2009-12-19 16:02:29 +00:00
parent 7fc7324ef8
commit 07a2c21d24
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/station_gui.cpp
View File

@ -996,37 +996,14 @@ struct StationViewWindow : public Window {
*/ */
void DrawAcceptedCargo(const Rect &r) const void DrawAcceptedCargo(const Rect &r) const
{ {
char string[512];
char *b = string;
bool first = true;
b = InlineString(b, STR_STATION_VIEW_ACCEPTS_CARGO);
const Station *st = Station::Get(this->window_number); const Station *st = Station::Get(this->window_number);
uint32 cargo_mask = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) { for (CargoID i = 0; i < NUM_CARGO; i++) {
if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode() if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) SetBit(cargo_mask, i);
if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) {
if (first) {
first = false;
} else {
/* Add a comma if this is not the first item */
*b++ = ',';
*b++ = ' ';
}
b = InlineString(b, CargoSpec::Get(i)->name);
}
} }
Rect s = {r.left + WD_FRAMERECT_LEFT, r.top + WD_FRAMERECT_TOP, r.right - WD_FRAMERECT_RIGHT, r.bottom - WD_FRAMERECT_BOTTOM};
/* If first is still true then no cargo is accepted */ DrawCargoListText(cargo_mask, s, STR_STATION_VIEW_ACCEPTS_CARGO);
if (first) b = InlineString(b, STR_JUST_NOTHING);
*b = '\0';
/* Make sure we detect any buffer overflow */
assert(b < endof(string));
SetDParamStr(0, string);
DrawStringMultiLine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, r.bottom - WD_FRAMERECT_BOTTOM, STR_JUST_RAW_STRING);
} }
/** Draw cargo ratings in the #SVW_ACCEPTLIST widget. /** Draw cargo ratings in the #SVW_ACCEPTLIST widget.