Mercurial > hg > openttd
changeset 19915:87707709f6b9 draft
(svn r24848) -Fix [FS#5386]: Consider regearing-like cargos as no-cargo in cargo filters.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 23 Dec 2012 22:12:52 +0000 |
| parents | 6b6c382026ef |
| children | ea985744f1f3 |
| files | src/build_vehicle_gui.cpp src/cargotype.cpp src/cargotype.h |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -516,7 +516,7 @@ static bool CDECL CargoFilter(const EngineID *eid, const CargoID cid) { if (cid == CF_ANY) return true; - uint32 refit_mask = GetUnionOfArticulatedRefitMasks(*eid, true); + uint32 refit_mask = GetUnionOfArticulatedRefitMasks(*eid, true) & _standard_cargo_mask; return (cid == CF_NONE ? refit_mask == 0 : HasBit(refit_mask, cid)); }
--- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -23,12 +23,17 @@ CargoSpec CargoSpec::array[NUM_CARGO]; /** - * Bitmask of cargo types available. + * Bitmask of cargo types available. This includes phony cargoes like regearing cargoes. * Initialized during a call to #SetupCargoForClimate. */ uint32 _cargo_mask; /** + * Bitmask of real cargo types available. Phony cargoes like regearing cargoes are excluded. + */ +uint32 _standard_cargo_mask; + +/** * Set up the default cargo types for the given landscape type. * @param l Landscape */ @@ -176,10 +181,13 @@ /* Sort cargo specifications by cargo class and name. */ QSortT(_sorted_cargo_specs, _sorted_cargo_specs_size, &CargoSpecClassSorter); + _standard_cargo_mask = 0; + _sorted_standard_cargo_specs_size = 0; FOR_ALL_SORTED_CARGOSPECS(cargo) { if (cargo->classes & CC_SPECIAL) break; _sorted_standard_cargo_specs_size++; + SetBit(_standard_cargo_mask, cargo->Index()); } }