miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}