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

(svn r18538) -Codechange: Split DrawStationCoverageText into a calculation part and a drawing part.

release/1.0
alberth 2009-12-19 15:52:50 +00:00
parent 9a11aed4bd
commit 7fc7324ef8
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/misc_gui.cpp
View File

@ -866,24 +866,22 @@ void GuiShowTooltips(StringID str, uint paramcount, const uint64 params[], bool
new TooltipsWindow(str, paramcount, params, use_left_mouse_button); new TooltipsWindow(str, paramcount, params, use_left_mouse_button);
} }
/**
static int DrawStationCoverageText(const CargoArray &cargos, * Draw a (multi)line of cargos seperated by commas, and prefixed with a string.
int left, int right, int top, StationCoverageType sct, bool supplies) * @param cargo_mask Mask of cargos to include in the list.
* @param r Rectangle to draw the cargos in.
* @param prefix String to use as prefix for the list of cargos.
* @return Bottom position of the last line used for drawing the cargos.
*/
int DrawCargoListText(uint32 cargo_mask, const Rect &r, StringID prefix)
{ {
bool first = true; bool first = true;
char string[512]; char string[512];
char *b = InlineString(string, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO); char *b = InlineString(string, prefix);
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 (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
switch (sct) { if (HasBit(cargo_mask, i)) {
case SCT_PASSENGERS_ONLY: if (!IsCargoInClass(i, CC_PASSENGERS)) continue; break;
case SCT_NON_PASSENGERS_ONLY: if (IsCargoInClass(i, CC_PASSENGERS)) continue; break;
case SCT_ALL: break;
default: NOT_REACHED();
}
if (cargos[i] >= (supplies ? 1U : 8U)) {
if (first) { if (first) {
first = false; first = false;
} else { } else {
@ -904,7 +902,7 @@ static int DrawStationCoverageText(const CargoArray &cargos,
assert(b < endof(string)); assert(b < endof(string));
SetDParamStr(0, string); SetDParamStr(0, string);
return DrawStringMultiLine(left, right, top, INT32_MAX, STR_JUST_RAW_STRING); return DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_JUST_RAW_STRING);
} }
/** /**
@ -927,7 +925,20 @@ int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageTyp
} else { } else {
cargos = GetAcceptanceAroundTiles(tile, _thd.size.x / TILE_SIZE, _thd.size.y / TILE_SIZE, rad); cargos = GetAcceptanceAroundTiles(tile, _thd.size.x / TILE_SIZE, _thd.size.y / TILE_SIZE, rad);
} }
return DrawStationCoverageText(cargos, left, right, top, sct, supplies);
/* Convert cargo counts to a set of cargo bits, and draw the result. */
uint32 cargo_mask = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) {
switch (sct) {
case SCT_PASSENGERS_ONLY: if (!IsCargoInClass(i, CC_PASSENGERS)) continue; break;
case SCT_NON_PASSENGERS_ONLY: if (IsCargoInClass(i, CC_PASSENGERS)) continue; break;
case SCT_ALL: break;
default: NOT_REACHED();
}
if (cargos[i] >= (supplies ? 1U : 8U)) SetBit(cargo_mask, i);
}
Rect r = {left, top, right, INT32_MAX};
return DrawCargoListText(cargo_mask, r, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO);
} }
return top; return top;

2
src/station_gui.h
View File

@ -39,6 +39,8 @@ enum StationCoverageType {
SCT_ALL, ///< Draw all cargos. SCT_ALL, ///< Draw all cargos.
}; };
/* misc_gui.cpp */
int DrawCargoListText(uint32 cargo_mask, const Rect &r, StringID prefix);
int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageType sct, int rad, bool supplies); int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageType sct, int rad, bool supplies);
void CheckRedrawStationCoverage(const Window *w); void CheckRedrawStationCoverage(const Window *w);