mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codefix: Make three _filter_funcs definitions distinct. (#12573) 

Rename the GUIList function lists defined as the same symbol.
This commit is contained in:
Peter Nelson 2024-04-25 21:01:15 +01:00 committed by GitHub
parent 5bc9854be2
commit 0075a95278
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build_vehicle_gui.cpp
View File

@ -550,7 +550,7 @@ static bool CDECL CargoAndEngineFilter(const GUIEngineListItem *item, const Carg
}
}
static GUIEngineList::FilterFunction * const _filter_funcs[] = {
static GUIEngineList::FilterFunction * const _engine_filter_funcs[] = {
&CargoAndEngineFilter,
};
@ -1312,7 +1312,7 @@ struct BuildVehicleWindow : Window {
this->cargo_filter_criteria = _engine_sort_last_cargo_criteria[this->vehicle_type];
if (this->cargo_filter_criteria < NUM_CARGO && !HasBit(_standard_cargo_mask, this->cargo_filter_criteria)) this->cargo_filter_criteria = CargoFilterCriteria::CF_ANY;
this->eng_list.SetFilterFuncs(_filter_funcs);
this->eng_list.SetFilterFuncs(_engine_filter_funcs);
this->eng_list.SetFilterState(this->cargo_filter_criteria != CargoFilterCriteria::CF_ANY);
}

4
src/industry_gui.cpp
View File

@ -1310,7 +1310,7 @@ static bool CDECL CargoFilter(const Industry * const *industry, const std::pair<
return accepted_cargo_matches && produced_cargo_matches;
}
static GUIIndustryList::FilterFunction * const _filter_funcs[] = { &CargoFilter };
static GUIIndustryList::FilterFunction * const _industry_filter_funcs[] = { &CargoFilter };
/** Enum referring to the Hotkeys in the industry directory window */
enum IndustryDirectoryHotkeys {
@ -1398,7 +1398,7 @@ protected:
this->produced_cargo_filter_criteria = CargoFilterCriteria::CF_ANY;
this->accepted_cargo_filter_criteria = CargoFilterCriteria::CF_ANY;
this->industries.SetFilterFuncs(_filter_funcs);
this->industries.SetFilterFuncs(_industry_filter_funcs);
bool is_filtering_necessary = this->produced_cargo_filter_criteria != CargoFilterCriteria::CF_ANY || this->accepted_cargo_filter_criteria != CargoFilterCriteria::CF_ANY;

4
src/vehicle_gui.cpp
View File

@ -334,7 +334,7 @@ static bool CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid)
return false;
}
static GUIVehicleGroupList::FilterFunction * const _filter_funcs[] = {
static GUIVehicleGroupList::FilterFunction * const _vehicle_group_filter_funcs[] = {
&CargoFilter,
};
@ -359,7 +359,7 @@ void BaseVehicleListWindow::SetCargoFilter(CargoID cid)
void BaseVehicleListWindow::SetCargoFilterArray()
{
this->cargo_filter_criteria = CargoFilterCriteria::CF_ANY;
this->vehgroups.SetFilterFuncs(_filter_funcs);
this->vehgroups.SetFilterFuncs(_vehicle_group_filter_funcs);
this->vehgroups.SetFilterState(this->cargo_filter_criteria != CargoFilterCriteria::CF_ANY);
}