cpp/openttd-patchpack/source Changeset - r13986:5112a89213d1

Changeset - r13986:5112a89213d1

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 14 years ago 2009-12-19 15:52:50
alberth@openttd.org

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

2 files changed with 27 insertions and 14 deletions:

src/misc_gui.cpp

src/station_gui.h

0 comments (0 inline, 0 general)

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -866,24 +866,22 @@ void GuiShowTooltips(StringID str, uint @@
 	new TooltipsWindow(str, paramcount, params, use_left_mouse_button);
+}
 static int DrawStationCoverageText(const CargoArray &cargos,
 	int left, int right, int top, StationCoverageType sct, bool supplies)
 /**
  * Draw a (multi)line of cargos seperated by commas, and prefixed with a string.
  * @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;
 	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++) {
 		if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
 		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)) {
 		if (HasBit(cargo_mask, i)) {
 			if (first) {
 				first = false;
 			} else {
@@ @@ -904,7 +902,7 @@ static int DrawStationCoverageText(const @@
 	assert(b < endof(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 @@
 		} else {
 			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;

src/station_gui.h

➞

Show inline comments

@@ @@ -39,6 +39,8 @@ enum StationCoverageType { @@
 	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);
 void CheckRedrawStationCoverage(const Window *w);

0 comments (0 inline, 0 general)