petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r24848) -Fix [FS#5386]: Consider regearing-like cargos as no-cargo in cargo filters.

Browse Source
This commit is contained in:
frosch
2012-12-23 22:12:52 +00:00
parent 0ca14df566
commit 59951051a0
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cargotype.cpp
View File

@@ -23,11 +23,16 @@
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 @@ void InitializeSortedCargoSpecs()
/* 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());
}
}