Mercurial > hg > openttd
changeset 17810:3f62ad83cb4f draft
(svn r22595) -Fix [FS#4560] (r22593): build railstation gui was broken with newgrf stations
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Fri, 17 Jun 2011 20:32:25 +0000 |
| parents | 981f157de59f |
| children | 1b85399e5bd0 |
| files | src/station_gui.cpp |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -84,6 +84,7 @@ 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 @@ } /* 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 @@ } 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); } /**