mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r22595) -Fix [FS#4560] (r22593): build railstation gui was broken with newgrf stations
This commit is contained in:
parent
bf994b46f1
commit
87e59dce5a
|
@ -84,6 +84,7 @@ static 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)
|
||||||
{
|
{
|
||||||
TileIndex tile = TileVirtXY(_thd.pos.x, _thd.pos.y);
|
TileIndex tile = TileVirtXY(_thd.pos.x, _thd.pos.y);
|
||||||
|
uint32 cargo_mask = 0;
|
||||||
if (_thd.drawstyle == HT_RECT && tile < MapSize()) {
|
if (_thd.drawstyle == HT_RECT && tile < MapSize()) {
|
||||||
CargoArray cargos;
|
CargoArray cargos;
|
||||||
if (supplies) {
|
if (supplies) {
|
||||||
|
@ -93,7 +94,6 @@ int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageTyp
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Convert cargo counts to a set of cargo bits, and draw the result. */
|
/* 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++) {
|
for (CargoID i = 0; i < NUM_CARGO; i++) {
|
||||||
switch (sct) {
|
switch (sct) {
|
||||||
case SCT_PASSENGERS_ONLY: if (!IsCargoInClass(i, CC_PASSENGERS)) continue; break;
|
case SCT_PASSENGERS_ONLY: if (!IsCargoInClass(i, CC_PASSENGERS)) continue; break;
|
||||||
|
@ -103,11 +103,9 @@ int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageTyp
|
||||||
}
|
}
|
||||||
if (cargos[i] >= (supplies ? 1U : 8U)) SetBit(cargo_mask, i);
|
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);
|
|
||||||
}
|
}
|
||||||
|
Rect r = {left, top, right, INT32_MAX};
|
||||||
return top;
|
return DrawCargoListText(cargo_mask, r, supplies ? STR_STATION_BUILD_SUPPLIES_CARGO : STR_STATION_BUILD_ACCEPTS_CARGO);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue