summaryrefslogtreecommitdiff
path: root/src/newgrf_airport.cpp
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/newgrf_airport.cpp
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/newgrf_airport.cpp')
-rw-r--r--src/newgrf_airport.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp
index 6213097bd..14af15a37 100644
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -39,9 +39,9 @@ struct AirportScopeResolver : public ScopeResolver {
{
}
- /* virtual */ uint32 GetRandomBits() const;
- /* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
- /* virtual */ void StorePSA(uint pos, int32 value);
+ uint32 GetRandomBits() const override;
+ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const override;
+ void StorePSA(uint pos, int32 value) override;
};
/** Resolver object for airports. */
@@ -51,7 +51,7 @@ struct AirportResolverObject : public ResolverObject {
AirportResolverObject(TileIndex tile, Station *st, byte airport_id, byte layout,
CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
- /* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
+ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0) override
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->airport_scope;
@@ -59,7 +59,7 @@ struct AirportResolverObject : public ResolverObject {
}
}
- /* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
+ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
};
/**