cpp/openttd-patchpack/source File Diff

File diff r17799:8091c6fb9736 → r17800:b328f4737f81

src/station_gui.cpp

➞

Show inline comments

@@ @@ -84,6 +84,7 @@ static int DrawCargoListText(uint32 carg @@
 int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageType sct, int rad, bool supplies)
+{
 	TileIndex tile = TileVirtXY(_thd.pos.x, _thd.pos.y);
 	uint32 cargo_mask = 0;
 	if (_thd.drawstyle == HT_RECT && tile < MapSize()) {
 		CargoArray cargos;
 		if (supplies) {
@@ @@ -93,7 +94,6 @@ int DrawStationCoverageAreaText(int left @@
+		}
 		/* 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;
@@ @@ -103,11 +103,9 @@ int DrawStationCoverageAreaText(int left @@
+			}
 			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;
 	Rect r = {left, top, right, INT32_MAX};
 	return DrawCargoListText(cargo_mask, r, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO);
+}
 /**