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

Remove unused variables: CompanyStationsWindow::last_station, IndustryDirectoryWindow::last_industry

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-01-06 20:44:05 +00:00
parent 964739f235
commit 741237a94a
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_gui.cpp
View File

@@ -1251,7 +1251,6 @@ class IndustryDirectoryWindow : public Window {
protected: protected:
/* Runtime saved values */ /* Runtime saved values */
static Listing last_sorting; static Listing last_sorting;
static const Industry *last_industry;
/* Constants for sorting stations */ /* Constants for sorting stations */
static const StringID sorter_names[]; static const StringID sorter_names[];
@@ -1350,8 +1349,6 @@ protected:
this->industries.RebuildDone(); this->industries.RebuildDone();
} }
IndustryDirectoryWindow::last_industry = nullptr; // Reset name sorter sort cache
auto filter = std::make_pair(this->cargo_filter[this->accepted_cargo_filter_criteria], auto filter = std::make_pair(this->cargo_filter[this->accepted_cargo_filter_criteria],
this->cargo_filter[this->produced_cargo_filter_criteria]); this->cargo_filter[this->produced_cargo_filter_criteria]);
@@ -1712,7 +1709,6 @@ public:
}; };
Listing IndustryDirectoryWindow::last_sorting = {false, 0}; Listing IndustryDirectoryWindow::last_sorting = {false, 0};
const Industry *IndustryDirectoryWindow::last_industry = nullptr;
/* Available station sorting functions. */ /* Available station sorting functions. */
GUIIndustryList::SortFunction * const IndustryDirectoryWindow::sorter_funcs[] = { GUIIndustryList::SortFunction * const IndustryDirectoryWindow::sorter_funcs[] = {

5
src/station_gui.cpp
View File

@@ -210,7 +210,6 @@ protected:
static bool include_empty; // whether we should include stations without waiting cargo static bool include_empty; // whether we should include stations without waiting cargo
static const CargoTypes cargo_filter_max; static const CargoTypes cargo_filter_max;
static CargoTypes cargo_filter; // bitmap of cargo types to include static CargoTypes cargo_filter; // bitmap of cargo types to include
static const Station *last_station;
/* Constants for sorting stations */ /* Constants for sorting stations */
static const StringID sorter_names[]; static const StringID sorter_names[];
@@ -334,9 +333,6 @@ protected:
{ {
if (!this->stations.Sort()) return; if (!this->stations.Sort()) return;
/* Reset name sorter sort cache */
this->last_station = nullptr;
/* Set the modified widget dirty */ /* Set the modified widget dirty */
this->SetWidgetDirty(WID_STL_LIST); this->SetWidgetDirty(WID_STL_LIST);
} }
@@ -694,7 +690,6 @@ byte CompanyStationsWindow::facilities = FACIL_TRAIN | FACIL_TRUCK_STOP | FACIL_
bool CompanyStationsWindow::include_empty = true; bool CompanyStationsWindow::include_empty = true;
const CargoTypes CompanyStationsWindow::cargo_filter_max = ALL_CARGOTYPES; const CargoTypes CompanyStationsWindow::cargo_filter_max = ALL_CARGOTYPES;
CargoTypes CompanyStationsWindow::cargo_filter = ALL_CARGOTYPES; CargoTypes CompanyStationsWindow::cargo_filter = ALL_CARGOTYPES;
const Station *CompanyStationsWindow::last_station = nullptr;
/* Available station sorting functions */ /* Available station sorting functions */
GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = { GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = {