[Scummvm-git-logs] scummvm master -> d451c6ac5132984043940409864186b99806cdc6
sev-
sev at scummvm.org
Sun Feb 2 23:39:52 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d451c6ac51 ULTIMA: Added override keywords
Commit: d451c6ac5132984043940409864186b99806cdc6
https://github.com/scummvm/scummvm/commit/d451c6ac5132984043940409864186b99806cdc6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T00:39:39+01:00
Commit Message:
ULTIMA: Added override keywords
Changed paths:
engines/ultima/ultima8/audio/music_flex.h
engines/ultima/ultima8/audio/sound_flex.h
engines/ultima/ultima8/filesys/dir_file.h
engines/ultima/ultima8/filesys/flex_file.h
engines/ultima/ultima8/filesys/named_archive_file.h
engines/ultima/ultima8/filesys/raw_archive.h
engines/ultima/ultima8/filesys/u8_save_file.h
engines/ultima/ultima8/games/start_u8_process.h
engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
engines/ultima/ultima8/graphics/shape_archive.h
engines/ultima/ultima8/gumps/ask_gump.h
engines/ultima/ultima8/gumps/bark_gump.h
engines/ultima/ultima8/gumps/credits_gump.h
engines/ultima/ultima8/gumps/menu_gump.h
engines/ultima/ultima8/world/actors/actor_anim_process.h
engines/ultima/ultima8/world/actors/targeted_anim_process.h
engines/ultima/ultima8/world/create_item_process.h
diff --git a/engines/ultima/ultima8/audio/music_flex.h b/engines/ultima/ultima8/audio/music_flex.h
index e825aee..2e18396 100644
--- a/engines/ultima/ultima8/audio/music_flex.h
+++ b/engines/ultima/ultima8/audio/music_flex.h
@@ -64,9 +64,9 @@ public:
//! Get the Adlib Timbres (index 259)
IDataSource *getAdlibTimbres();
- virtual void cache(uint32 index);
- virtual void uncache(uint32 index);
- virtual bool isCached(uint32 index);
+ virtual void cache(uint32 index) override;
+ virtual void uncache(uint32 index) override;
+ virtual bool isCached(uint32 index) override;
uint8 *getRawObject(uint32 index, uint32 *sizep = 0) {
return Pentagram::Archive::getRawObject(index, sizep);
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index 4af5ebe..a8ef4cf 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -46,9 +46,9 @@ public:
return samples[index];
}
- virtual void cache(uint32 index);
- virtual void uncache(uint32 index);
- virtual bool isCached(uint32 index);
+ virtual void cache(uint32 index) override;
+ virtual void uncache(uint32 index) override;
+ virtual bool isCached(uint32 index) override;
private:
Pentagram::AudioSample **samples;
diff --git a/engines/ultima/ultima8/filesys/dir_file.h b/engines/ultima/ultima8/filesys/dir_file.h
index 376ff3e..c175a88 100644
--- a/engines/ultima/ultima8/filesys/dir_file.h
+++ b/engines/ultima/ultima8/filesys/dir_file.h
@@ -38,13 +38,13 @@ public:
explicit DirFile(const Std::string &path);
virtual ~DirFile();
- virtual bool exists(const Std::string &name);
+ virtual bool exists(const Std::string &name) override;
virtual uint8 *getObject(const Std::string &name, uint32 *size = 0);
- virtual uint32 getSize(const Std::string &name);
+ virtual uint32 getSize(const Std::string &name) override;
- virtual uint32 getCount() {
+ virtual uint32 getCount() override {
return count;
}
diff --git a/engines/ultima/ultima8/filesys/flex_file.h b/engines/ultima/ultima8/filesys/flex_file.h
index a9b0627..c0558a0 100644
--- a/engines/ultima/ultima8/filesys/flex_file.h
+++ b/engines/ultima/ultima8/filesys/flex_file.h
@@ -40,10 +40,10 @@ public:
explicit FlexFile(IDataSource *ds);
virtual ~FlexFile();
- virtual bool exists(uint32 index) {
+ virtual bool exists(uint32 index) override {
return getSize(index) > 0;
}
- virtual bool exists(const Std::string &name) {
+ virtual bool exists(const Std::string &name) override {
uint32 index;
if (nameToIndex(name, index))
return exists(index);
@@ -51,8 +51,8 @@ public:
return false;
}
- virtual uint8 *getObject(uint32 index, uint32 *size = 0);
- virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) {
+ virtual uint8 *getObject(uint32 index, uint32 *size = 0) override;
+ virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override {
uint32 index;
if (nameToIndex(name, index))
return getObject(index, size);
@@ -61,8 +61,8 @@ public:
}
- virtual uint32 getSize(uint32 index);
- virtual uint32 getSize(const Std::string &name) {
+ virtual uint32 getSize(uint32 index) override;
+ virtual uint32 getSize(const Std::string &name) override {
uint32 index;
if (nameToIndex(name, index))
return getSize(index);
@@ -70,18 +70,18 @@ public:
return 0;
}
- virtual uint32 getCount() {
+ virtual uint32 getCount() override {
return count;
}
- virtual uint32 getIndexCount() {
+ virtual uint32 getIndexCount() override {
return count;
}
- virtual bool isIndexed() const {
+ virtual bool isIndexed() const override {
return true;
}
- virtual bool isNamed() const {
+ virtual bool isNamed() const override {
return false;
}
diff --git a/engines/ultima/ultima8/filesys/named_archive_file.h b/engines/ultima/ultima8/filesys/named_archive_file.h
index 6b76f7d..1fcfda7 100644
--- a/engines/ultima/ultima8/filesys/named_archive_file.h
+++ b/engines/ultima/ultima8/filesys/named_archive_file.h
@@ -36,36 +36,36 @@ public:
NamedArchiveFile() : indexCount(0) { }
virtual ~NamedArchiveFile() { }
- virtual bool exists(uint32 index) {
+ virtual bool exists(uint32 index) override {
Std::string name;
return (indexToName(index, name));
}
- virtual bool exists(const Std::string &name) = 0;
+ virtual bool exists(const Std::string &name) override = 0;
- virtual uint8 *getObject(uint32 index, uint32 *size = 0) {
+ virtual uint8 *getObject(uint32 index, uint32 *size = 0) override {
Std::string name;
if (!indexToName(index, name)) return 0;
return getObject(name, size);
}
- virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) = 0;
+ virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override = 0;
- virtual uint32 getSize(uint32 index) {
+ virtual uint32 getSize(uint32 index) override {
Std::string name;
if (!indexToName(index, name)) return 0;
return getSize(name);
}
- virtual uint32 getSize(const Std::string &name) = 0;
+ virtual uint32 getSize(const Std::string &name) override = 0;
- virtual uint32 getCount() = 0;
+ virtual uint32 getCount() override = 0;
- virtual uint32 getIndexCount() {
+ virtual uint32 getIndexCount() override {
return indexCount;
}
- virtual bool isIndexed() const {
+ virtual bool isIndexed() const override {
return false;
}
- virtual bool isNamed() const {
+ virtual bool isNamed() const override {
return true;
}
diff --git a/engines/ultima/ultima8/filesys/raw_archive.h b/engines/ultima/ultima8/filesys/raw_archive.h
index d8bd771..e534a9f 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.h
+++ b/engines/ultima/ultima8/filesys/raw_archive.h
@@ -43,9 +43,9 @@ public:
virtual ~RawArchive();
- virtual void cache(uint32 index);
- virtual void uncache(uint32 index);
- virtual bool isCached(uint32 index);
+ virtual void cache(uint32 index) override;
+ virtual void uncache(uint32 index) override;
+ virtual bool isCached(uint32 index) override;
//! return object. DON'T delete or modify!
virtual const uint8 *get_object_nodel(uint32 index);
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.h b/engines/ultima/ultima8/filesys/u8_save_file.h
index 3714540..217a532 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.h
+++ b/engines/ultima/ultima8/filesys/u8_save_file.h
@@ -41,13 +41,13 @@ public:
explicit U8SaveFile(IDataSource *ds);
virtual ~U8SaveFile();
- virtual bool exists(const Std::string &name);
+ virtual bool exists(const Std::string &name) override;
- virtual uint8 *getObject(const Std::string &name, uint32 *size = 0);
+ virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
- virtual uint32 getSize(const Std::string &name);
+ virtual uint32 getSize(const Std::string &name) override;
- virtual uint32 getCount() {
+ virtual uint32 getCount() override {
return count;
}
diff --git a/engines/ultima/ultima8/games/start_u8_process.h b/engines/ultima/ultima8/games/start_u8_process.h
index 260ad7b..3ed628f 100644
--- a/engines/ultima/ultima8/games/start_u8_process.h
+++ b/engines/ultima/ultima8/games/start_u8_process.h
@@ -33,14 +33,14 @@ protected:
bool _skipStart;
Std::string _saveName;
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
public:
StartU8Process(const Std::string &saveName);
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
bool loadData(IDataSource *ids, uint32 version);
};
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
index 50905da..9d8df28 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
@@ -56,7 +56,7 @@ public:
ShapeFont *getFont(uint32 fontnum);
- virtual void cache(uint32 fontnum);
+ virtual void cache(uint32 fontnum) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/graphics/shape_archive.h
index 0778e24..5b38bd6 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/graphics/shape_archive.h
@@ -57,9 +57,9 @@ public:
Shape *getShape(uint32 shapenum);
- virtual void cache(uint32 shapenum);
- virtual void uncache(uint32 shapenum);
- virtual bool isCached(uint32 shapenum);
+ virtual void cache(uint32 shapenum) override;
+ virtual void uncache(uint32 shapenum) override;
+ virtual bool isCached(uint32 shapenum) override;
protected:
uint16 id;
diff --git a/engines/ultima/ultima8/gumps/ask_gump.h b/engines/ultima/ultima8/gumps/ask_gump.h
index bc983e6..753c543 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.h
+++ b/engines/ultima/ultima8/gumps/ask_gump.h
@@ -42,13 +42,13 @@ public:
virtual ~AskGump();
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void ChildNotify(Gump *child, uint32 message) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/bark_gump.h b/engines/ultima/ultima8/gumps/bark_gump.h
index 5a63740..f79e79c 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.h
+++ b/engines/ultima/ultima8/gumps/bark_gump.h
@@ -46,13 +46,13 @@ public:
virtual ~BarkGump(void);
// Run the gump (decrement the counter)
- virtual void run();
+ virtual void run() override;
// Got to the next page on mouse click
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
protected:
//! show next text.
diff --git a/engines/ultima/ultima8/gumps/credits_gump.h b/engines/ultima/ultima8/gumps/credits_gump.h
index ec9d362..ac894ca 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.h
+++ b/engines/ultima/ultima8/gumps/credits_gump.h
@@ -41,21 +41,21 @@ public:
virtual ~CreditsGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Set a configuration option to true when user watches entire sequence
void SetFlagWhenFinished(Std::string configkey_) {
configkey = configkey_;
}
- virtual void Close(bool no_del = false);
+ virtual void Close(bool no_del = false) override;
- virtual void run();
+ virtual void run() override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
+ virtual bool OnKeyDown(int key, int mod) override;
protected:
diff --git a/engines/ultima/ultima8/gumps/menu_gump.h b/engines/ultima/ultima8/gumps/menu_gump.h
index 8687f36..42fee99 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.h
+++ b/engines/ultima/ultima8/gumps/menu_gump.h
@@ -39,15 +39,15 @@ public:
virtual ~MenuGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void Close(bool no_del = false);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void Close(bool no_del = false) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual bool OnTextInput(int unicode);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual bool OnTextInput(int unicode) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
static void showMenu();
static void ConCmd_showMenu(const Console::ArgvType &argv);
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.h b/engines/ultima/ultima8/world/actors/actor_anim_process.h
index 4b6a12c..72f6bc8 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.h
@@ -44,11 +44,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
- virtual void terminate();
+ virtual void terminate() override;
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
Animation::Sequence getAction() const {
return action;
@@ -56,7 +56,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
virtual bool init();
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.h b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
index e4da3e1..20a2364 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
@@ -42,9 +42,9 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
- virtual bool init();
+ virtual bool init() override;
int32 x, y, z;
};
diff --git a/engines/ultima/ultima8/world/create_item_process.h b/engines/ultima/ultima8/world/create_item_process.h
index c7b50f7..cbfbeed 100644
--- a/engines/ultima/ultima8/world/create_item_process.h
+++ b/engines/ultima/ultima8/world/create_item_process.h
@@ -40,11 +40,11 @@ public:
uint32 extendedflags, int32 x, int32 y, int32 z);
virtual ~CreateItemProcess(void);
- virtual void run();
+ virtual void run() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
uint32 shape;
uint32 frame;
More information about the Scummvm-git-logs
mailing list