summaryrefslogtreecommitdiff
path: root/src/script
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/script
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/script')
-rw-r--r--src/script/api/script_text.hpp2
-rw-r--r--src/script/script_scanner.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/script_text.hpp b/src/script/api/script_text.hpp
index ed14e391d..0b82ffb20 100644
--- a/src/script/api/script_text.hpp
+++ b/src/script/api/script_text.hpp
@@ -45,7 +45,7 @@ public:
RawText(const char *text);
~RawText();
- /* virtual */ const char *GetEncodedText() { return this->text; }
+ const char *GetEncodedText() override { return this->text; }
private:
const char *text;
};
diff --git a/src/script/script_scanner.hpp b/src/script/script_scanner.hpp
index 50dad02ad..7fecf6eb2 100644
--- a/src/script/script_scanner.hpp
+++ b/src/script/script_scanner.hpp
@@ -77,7 +77,7 @@ public:
*/
const char *FindMainScript(const ContentInfo *ci, bool md5sum);
- /* virtual */ bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename);
+ bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename) override;
/**
* Rescan the script dir.