mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: More use of override keyword.

pull/7399/head
peter1138 2019-03-24 16:23:46 +00:00 committed by Charles Pigott
parent e6bb90543e
commit b1fb3f4fb8
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_commons.h
View File

@ -228,6 +228,7 @@ class HouseOverrideManager : public OverrideManagerBase {
public: public:
HouseOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) : HouseOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
OverrideManagerBase(offset, maximum, invalid) {} OverrideManagerBase(offset, maximum, invalid) {}
void SetEntitySpec(const HouseSpec *hs); void SetEntitySpec(const HouseSpec *hs);
}; };
@ -238,8 +239,9 @@ public:
IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) : IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
OverrideManagerBase(offset, maximum, invalid) {} OverrideManagerBase(offset, maximum, invalid) {}
virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id); uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id) override;
virtual uint16 GetID(uint8 grf_local_id, uint32 grfid) const; uint16 GetID(uint8 grf_local_id, uint32 grfid) const override;
void SetEntitySpec(IndustrySpec *inds); void SetEntitySpec(IndustrySpec *inds);
}; };

24
src/textfile_gui.h
View File

@ -32,17 +32,21 @@ struct TextfileWindow : public Window, MissingGlyphSearcher {
static const int BOTTOM_SPACING = WD_FRAMETEXT_BOTTOM; ///< Additional spacing at the bottom of the #WID_TF_BACKGROUND widget. static const int BOTTOM_SPACING = WD_FRAMETEXT_BOTTOM; ///< Additional spacing at the bottom of the #WID_TF_BACKGROUND widget.
TextfileWindow(TextfileType file_type); TextfileWindow(TextfileType file_type);
virtual ~TextfileWindow(); ~TextfileWindow();
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize);
virtual void OnClick(Point pt, int widget, int click_count); void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override;
virtual void DrawWidget(const Rect &r, int widget) const; void OnClick(Point pt, int widget, int click_count) override;
virtual void OnResize(); void DrawWidget(const Rect &r, int widget) const override;
virtual void Reset(); void OnResize() override;
virtual FontSize DefaultSize();
virtual const char *NextString(); void Reset() override;
virtual bool Monospace(); FontSize DefaultSize() override;
virtual void SetFontNames(FreeTypeSettings *settings, const char *font_name); const char *NextString() override;
bool Monospace() override;
void SetFontNames(FreeTypeSettings *settings, const char *font_name) override;
virtual void LoadTextfile(const char *textfile, Subdirectory dir); virtual void LoadTextfile(const char *textfile, Subdirectory dir);
private: private:
uint GetContentHeight(); uint GetContentHeight();
void SetupScrollbars(); void SetupScrollbars();