diff options
| author | PeterN <peter@fuzzle.org> | 2018-06-26 13:32:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 13:32:58 +0100 |
| commit | 11ab3c4ea2f6a6d29efda8c9ba2af04194621ea7 (patch) | |
| tree | 88a8cbfb1cd8ddc630cc4e63ffc9ac436e9c4153 /src/graph_gui.cpp | |
| parent | 7eca4a9b47e5bdf5123be6158c89be8ebeb213d6 (diff) | |
| download | openttd-11ab3c4ea2f6a6d29efda8c9ba2af04194621ea7.tar.xz | |
Change: Increase cargo type limit to 64.
Diffstat (limited to 'src/graph_gui.cpp')
| -rw-r--r-- | src/graph_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index c12c6ace4..f4334429f 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -33,8 +33,8 @@ #include "safeguards.h" /* Bitmasks of company and cargo indices that shouldn't be drawn. */ -static uint _legend_excluded_companies; -static uint _legend_excluded_cargo; +static CompanyMask _legend_excluded_companies; +static CargoTypes _legend_excluded_cargo; /* Apparently these don't play well with enums. */ static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn. @@ -166,14 +166,14 @@ struct ValuesInterval { struct BaseGraphWindow : Window { protected: - static const int GRAPH_MAX_DATASETS = 32; + static const int GRAPH_MAX_DATASETS = 64; static const int GRAPH_AXIS_LINE_COLOUR = PC_BLACK; static const int GRAPH_NUM_MONTHS = 24; ///< Number of months displayed in the graph. static const int MIN_GRAPH_NUM_LINES_Y = 9; ///< Minimal number of horizontal lines to draw. static const int MIN_GRID_PIXEL_SIZE = 20; ///< Minimum distance between graph lines. - uint excluded_data; ///< bitmask of the datasets that shouldn't be displayed. + uint64 excluded_data; ///< bitmask of the datasets that shouldn't be displayed. byte num_dataset; byte num_on_x_axis; byte num_vert_lines; @@ -561,7 +561,7 @@ public: */ void UpdateStatistics(bool initialize) { - uint excluded_companies = _legend_excluded_companies; + CompanyMask excluded_companies = _legend_excluded_companies; /* Exclude the companies which aren't valid */ for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) { |