summaryrefslogtreecommitdiff
path: root/src/station_base.h
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-03-03 22:25:13 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commitaf7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch)
tree1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/station_base.h
parent31260e66252fb4d0dda6f992520faeeb96929cfe (diff)
downloadopenttd-af7d9020a15c1b1a14b3981ac73c70d2e58cc877.tar.xz
Codechange: Use override specifer for overriding member declarations
This is a C++11 feature that allows the compiler to check that a virtual member declaration overrides a base-class member with the same signature. Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked as virtual despite being a template.
Diffstat (limited to 'src/station_base.h')
-rw-r--r--src/station_base.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/station_base.h b/src/station_base.h
index b3a4a76c7..243a2f0ce 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -490,12 +490,12 @@ public:
void MarkTilesDirty(bool cargo_change) const;
- void UpdateVirtCoord();
+ void UpdateVirtCoord() override;
void AfterStationTileSetChange(bool adding, StationType type);
- /* virtual */ uint GetPlatformLength(TileIndex tile, DiagDirection dir) const;
- /* virtual */ uint GetPlatformLength(TileIndex tile) const;
+ uint GetPlatformLength(TileIndex tile, DiagDirection dir) const override;
+ uint GetPlatformLength(TileIndex tile) const override;
void RecomputeCatchment();
static void RecomputeCatchmentForAll();
@@ -509,7 +509,7 @@ public:
return this->catchment_tiles.HasTile(tile);
}
- /* virtual */ inline bool TileBelongsToRailStation(TileIndex tile) const
+ inline bool TileBelongsToRailStation(TileIndex tile) const override
{
return IsRailStationTile(tile) && GetStationIndex(tile) == this->index;
}
@@ -519,9 +519,9 @@ public:
return IsAirportTile(tile) && GetStationIndex(tile) == this->index;
}
- /* virtual */ uint32 GetNewGRFVariable(const ResolverObject &object, byte variable, byte parameter, bool *available) const;
+ uint32 GetNewGRFVariable(const ResolverObject &object, byte variable, byte parameter, bool *available) const override;
- /* virtual */ void GetTileArea(TileArea *ta, StationType type) const;
+ void GetTileArea(TileArea *ta, StationType type) const override;
};
#define FOR_ALL_STATIONS(var) FOR_ALL_BASE_STATIONS_OF_TYPE(Station, var)