dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 70f9c3c6: The *_filter_criteria variables contain an index, not a cargo. (#8320)

Browse Source
This commit is contained in:
stormcone
2020-09-25 16:35:48 +02:00
committed by GitHub
parent 348c231e12
commit 49b75d67bd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/industry_gui.cpp
View File

@@ -1254,14 +1254,14 @@ protected:
CargoID cargo_filter[NUM_CARGO + 2]; ///< Available cargo filters; CargoID or CF_ANY or CF_NONE CargoID cargo_filter[NUM_CARGO + 2]; ///< Available cargo filters; CargoID or CF_ANY or CF_NONE
StringID cargo_filter_texts[NUM_CARGO + 3]; ///< Texts for filter_cargo, terminated by INVALID_STRING_ID StringID cargo_filter_texts[NUM_CARGO + 3]; ///< Texts for filter_cargo, terminated by INVALID_STRING_ID
CargoID produced_cargo_filter_criteria; ///< Selected produced cargo filter byte produced_cargo_filter_criteria; ///< Selected produced cargo filter index
CargoID accepted_cargo_filter_criteria; ///< Selected accepted cargo filter byte accepted_cargo_filter_criteria; ///< Selected accepted cargo filter index
/** /**
* Set cargo filter list item index. * Set cargo filter list item index.
* @param index The index of the cargo to be set * @param index The index of the cargo to be set
*/ */
void SetProducedCargoFilterIndex(int index) void SetProducedCargoFilterIndex(byte index)
{ {
if (this->produced_cargo_filter_criteria != index) { if (this->produced_cargo_filter_criteria != index) {
this->produced_cargo_filter_criteria = index; this->produced_cargo_filter_criteria = index;
@@ -1278,7 +1278,7 @@ protected:
* Set cargo filter list item index. * Set cargo filter list item index.
* @param index The index of the cargo to be set * @param index The index of the cargo to be set
*/ */
void SetAcceptedCargoFilterIndex(int index) void SetAcceptedCargoFilterIndex(byte index)
{ {
if (this->accepted_cargo_filter_criteria != index) { if (this->accepted_cargo_filter_criteria != index) {
this->accepted_cargo_filter_criteria = index; this->accepted_cargo_filter_criteria = index;
@@ -1296,7 +1296,7 @@ protected:
*/ */
void SetCargoFilterArray() void SetCargoFilterArray()
{ {
uint filter_items = 0; byte filter_items = 0;
/* Add item for disabling filtering. */ /* Add item for disabling filtering. */
this->cargo_filter[filter_items] = CF_ANY; this->cargo_filter[filter_items] = CF_ANY;