diff options
| -rw-r--r-- | src/industry_gui.cpp | 12 | ||||
| -rw-r--r-- | src/newgrf.cpp | 2 | ||||
| -rw-r--r-- | src/newgrf.h | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index c7ba3345c..88cbc91d1 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -416,10 +416,11 @@ public: } case WID_DPI_INFOPANEL: { - /* Extra line for cost outside of editor + extra lines for 'extra' information for NewGRFs. */ - int height = 2 + (_game_mode == GM_EDITOR ? 0 : 1) + (_loaded_newgrf_features.has_newindustries ? 4 : 0); + /* Extra line for cost outside of editor. */ + int height = 2 + (_game_mode == GM_EDITOR ? 0 : 1); uint extra_lines_req = 0; uint extra_lines_prd = 0; + uint extra_lines_newgrf = 0; uint max_minwidth = FONT_HEIGHT_NORMAL * MAX_MINWIDTH_LINEHEIGHTS; Dimension d = {0, 0}; for (byte i = 0; i < this->count; i++) { @@ -447,10 +448,15 @@ public: strdim.width = max_minwidth; } d = maxdim(d, strdim); + + if (indsp->grf_prop.grffile != nullptr) { + /* Reserve a few extra lines for text from an industry NewGRF. */ + extra_lines_newgrf = 4; + } } /* Set it to something more sane :) */ - height += extra_lines_prd + extra_lines_req; + height += extra_lines_prd + extra_lines_req + extra_lines_newgrf; size->height = height * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; size->width = d.width + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; break; diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 4429771e5..4abbcb3b7 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -8631,7 +8631,6 @@ void ResetNewGRFData() _loaded_newgrf_features.has_2CC = false; _loaded_newgrf_features.used_liveries = 1 << LS_DEFAULT; - _loaded_newgrf_features.has_newindustries = false; _loaded_newgrf_features.shore = SHORE_REPLACE_NONE; _loaded_newgrf_features.tram = TRAMWAY_REPLACE_DEPOT_NONE; @@ -9151,7 +9150,6 @@ static void FinaliseIndustriesArray() } _industry_mngr.SetEntitySpec(indsp); - _loaded_newgrf_features.has_newindustries = true; } } } diff --git a/src/newgrf.h b/src/newgrf.h index 20a178e1f..d9c8a4da5 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -174,7 +174,6 @@ enum TramReplacement { struct GRFLoadedFeatures { bool has_2CC; ///< Set if any vehicle is loaded which uses 2cc (two company colours). uint64 used_liveries; ///< Bitmask of #LiveryScheme used by the defined engines. - bool has_newindustries; ///< Set if there are any newindustries loaded. ShoreReplacement shore; ///< In which way shore sprites were replaced. TramReplacement tram; ///< In which way tram depots were replaced. }; |