[Scummvm-git-logs] scummvm master -> 5e6d684aa9c80bf09dcd753bf61b5a1869aba006
sev-
sev at scummvm.org
Sun Feb 2 22:15:45 UTC 2020
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2b17ee563c ULTIMA: Added override keywords
57ea211fe0 ULTIMA: More override keywords
611e5b4c0d ULTIMA: Firther work on override keywords addition
5e6d684aa9 ULTIMA: More work on override keywords
Commit: 2b17ee563c1c196271e510343150bbaeef3e9754
https://github.com/scummvm/scummvm/commit/2b17ee563c1c196271e510343150bbaeef3e9754
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T23:15:31+01:00
Commit Message:
ULTIMA: Added override keywords
Changed paths:
engines/ultima/shared/core/base_object.h
engines/ultima/shared/core/message_target.h
engines/ultima/shared/core/named_item.h
engines/ultima/shared/core/widgets.h
engines/ultima/ultima1/actions/attack.h
engines/ultima/ultima1/game.h
engines/ultima/ultima1/maps/map.h
engines/ultima/ultima1/maps/map_base.h
engines/ultima/ultima1/maps/map_dungeon.h
engines/ultima/ultima1/maps/map_overworld.h
engines/ultima/ultima1/u1gfx/text_cursor.h
engines/ultima/ultima1/widgets/bard.h
engines/ultima/ultima1/widgets/transport.h
engines/ultima/ultima1/widgets/urban_widget.h
diff --git a/engines/ultima/shared/core/base_object.h b/engines/ultima/shared/core/base_object.h
index 7b7f030..4821019 100644
--- a/engines/ultima/shared/core/base_object.h
+++ b/engines/ultima/shared/core/base_object.h
@@ -64,14 +64,15 @@ public:
#define CLASSDEF \
static ::Ultima::Shared::ClassDef type(); \
- virtual ::Ultima::Shared::ClassDef getType() const { return type(); }
+ virtual ::Ultima::Shared::ClassDef getType() const override { return type(); }
/**
* Defines the most basic root of the engine's object hierarchy.
*/
class BaseObject {
public:
- CLASSDEF
+ static ::Ultima::Shared::ClassDef type();
+ virtual ::Ultima::Shared::ClassDef getType() const { return type(); }
virtual ~BaseObject() {
}
diff --git a/engines/ultima/shared/core/message_target.h b/engines/ultima/shared/core/message_target.h
index c0ad138..5bfeefa 100644
--- a/engines/ultima/shared/core/message_target.h
+++ b/engines/ultima/shared/core/message_target.h
@@ -46,6 +46,11 @@ struct MSGMAP {
#define DECLARE_MESSAGE_MAP \
protected: \
static const Ultima::Shared::MSGMAP *getThisMessageMap(); \
+ virtual const Ultima::Shared::MSGMAP *getMessageMap() const override
+
+#define DECLARE_MESSAGE_MAP_BASE \
+protected: \
+ static const Ultima::Shared::MSGMAP *getThisMessageMap(); \
virtual const Ultima::Shared::MSGMAP *getMessageMap() const
#define BEGIN_MESSAGE_MAP(theClass, baseClass) \
@@ -91,7 +96,7 @@ protected: \
* that can receive messages
*/
class MessageTarget: public BaseObject {
- DECLARE_MESSAGE_MAP;
+ DECLARE_MESSAGE_MAP_BASE;
public:
CLASSDEF;
};
diff --git a/engines/ultima/shared/core/named_item.h b/engines/ultima/shared/core/named_item.h
index 5c1490e..d2715d1 100644
--- a/engines/ultima/shared/core/named_item.h
+++ b/engines/ultima/shared/core/named_item.h
@@ -43,7 +43,7 @@ public:
/**
* Gets the name of the item, if any
*/
- virtual const Common::String getName() const { return _name; }
+ virtual const Common::String getName() const override { return _name; }
};
} // End of namespace Shared
diff --git a/engines/ultima/shared/core/widgets.h b/engines/ultima/shared/core/widgets.h
index c545f50..5e7dcd9 100644
--- a/engines/ultima/shared/core/widgets.h
+++ b/engines/ultima/shared/core/widgets.h
@@ -91,7 +91,7 @@ public:
* @param isPreUpdate Update is called twice in succesion during the end of turn update.
* Once with true for all widgets, then with it false
*/
- virtual void update(bool isPreUpdate);
+ virtual void update(bool isPreUpdate) override;
/**
* True true if the creature is dead
diff --git a/engines/ultima/ultima1/actions/attack.h b/engines/ultima/ultima1/actions/attack.h
index cd707c2..ffc54c5 100644
--- a/engines/ultima/ultima1/actions/attack.h
+++ b/engines/ultima/ultima1/actions/attack.h
@@ -66,7 +66,7 @@ protected:
/**
* Do the attack in a given direction
*/
- virtual void doAttack(Shared::Maps::Direction dir);
+ virtual void doAttack(Shared::Maps::Direction dir) override;
public:
CLASSDEF;
@@ -86,7 +86,7 @@ protected:
/**
* Do the attack in a given direction
*/
- virtual void doAttack(Shared::Maps::Direction dir);
+ virtual void doAttack(Shared::Maps::Direction dir) override;
public:
CLASSDEF;
diff --git a/engines/ultima/ultima1/game.h b/engines/ultima/ultima1/game.h
index df6b3dc..1fb1b13 100644
--- a/engines/ultima/ultima1/game.h
+++ b/engines/ultima/ultima1/game.h
@@ -62,7 +62,7 @@ public:
/**
* Returns true if the current video mode is VGA
*/
- virtual bool isVGA() const { return _videoMode == VIDEOMODE_VGA; }
+ virtual bool isVGA() const override { return _videoMode == VIDEOMODE_VGA; }
/**
* Called when the game starts
@@ -72,7 +72,7 @@ public:
/**
* Returns true if the game can currently be saved
*/
- virtual bool canSaveGameStateCurrently();
+ virtual bool canSaveGameStateCurrently() override;
/**
* Give some treasure
diff --git a/engines/ultima/ultima1/maps/map.h b/engines/ultima/ultima1/maps/map.h
index 151788d..e384c25 100644
--- a/engines/ultima/ultima1/maps/map.h
+++ b/engines/ultima/ultima1/maps/map.h
@@ -95,7 +95,7 @@ public:
/**
* Clears all map data
*/
- virtual void clear();
+ virtual void clear() override;
/**
* Load a given map
diff --git a/engines/ultima/ultima1/maps/map_base.h b/engines/ultima/ultima1/maps/map_base.h
index 4775acb..470b6bf 100644
--- a/engines/ultima/ultima1/maps/map_base.h
+++ b/engines/ultima/ultima1/maps/map_base.h
@@ -50,7 +50,7 @@ public:
* Constructor
*/
MapBase(Ultima1Game *game, Ultima1Map *map);
-
+
/**
* Destructor
*/
@@ -112,7 +112,7 @@ public:
/**
* Cast a specific spell
*/
- virtual void castSpell(uint spell);
+ virtual void castSpell(uint spell) override;
/**
* Handles dropping an amount of coins
diff --git a/engines/ultima/ultima1/maps/map_dungeon.h b/engines/ultima/ultima1/maps/map_dungeon.h
index 8e15ccd..31243f3 100644
--- a/engines/ultima/ultima1/maps/map_dungeon.h
+++ b/engines/ultima/ultima1/maps/map_dungeon.h
@@ -76,12 +76,12 @@ public:
/**
* Handles loading and saving viewport
*/
- void synchronize(Common::Serializer &s);
+ void synchronize(Common::Serializer &s) override;
/**
* Load the map
*/
- virtual void load(Shared::Maps::MapId mapId);
+ virtual void load(Shared::Maps::MapId mapId) override;
/**
* Gets a tile at a given position
@@ -103,7 +103,7 @@ public:
/**
* Updates the map at the end of a turn
*/
- void update();
+ void update() override;
/**
* Spawns a monster within dungeons
diff --git a/engines/ultima/ultima1/maps/map_overworld.h b/engines/ultima/ultima1/maps/map_overworld.h
index 8df2d30..b7b3d21 100644
--- a/engines/ultima/ultima1/maps/map_overworld.h
+++ b/engines/ultima/ultima1/maps/map_overworld.h
@@ -46,7 +46,7 @@ public:
/**
* Load the map
*/
- virtual void load(Shared::Maps::MapId mapId);
+ virtual void load(Shared::Maps::MapId mapId) override;
/**
* Returns whether the map wraps around to the other side at it's edges (i.e. the overworld)
diff --git a/engines/ultima/ultima1/u1gfx/text_cursor.h b/engines/ultima/ultima1/u1gfx/text_cursor.h
index a008bed..acbb75b 100644
--- a/engines/ultima/ultima1/u1gfx/text_cursor.h
+++ b/engines/ultima/ultima1/u1gfx/text_cursor.h
@@ -53,7 +53,7 @@ public:
/**
* Update the cursor
*/
- virtual void update();
+ virtual void update() override;
/**
* Draw the cursor
diff --git a/engines/ultima/ultima1/widgets/bard.h b/engines/ultima/ultima1/widgets/bard.h
index f67a6d2..3b4417c 100644
--- a/engines/ultima/ultima1/widgets/bard.h
+++ b/engines/ultima/ultima1/widgets/bard.h
@@ -61,7 +61,7 @@ public:
/**
* Talk to an NPC
*/
- virtual void talk();
+ virtual void talk() override;
/**
* Removes hit points from a creature
diff --git a/engines/ultima/ultima1/widgets/transport.h b/engines/ultima/ultima1/widgets/transport.h
index d67569d..6a99432 100644
--- a/engines/ultima/ultima1/widgets/transport.h
+++ b/engines/ultima/ultima1/widgets/transport.h
@@ -163,7 +163,7 @@ public:
/**
* Get the name of a transport's weapons
*/
- virtual Common::String getWeaponsName();
+ virtual Common::String getWeaponsName() override;
/**
* Get the tile for the transport method
@@ -188,7 +188,7 @@ public:
/**
* Get the name of a transport's weapons
*/
- virtual Common::String getWeaponsName();
+ virtual Common::String getWeaponsName() override;
/**
* Get the tile for the transport method
diff --git a/engines/ultima/ultima1/widgets/urban_widget.h b/engines/ultima/ultima1/widgets/urban_widget.h
index baf6828..a25c09c 100644
--- a/engines/ultima/ultima1/widgets/urban_widget.h
+++ b/engines/ultima/ultima1/widgets/urban_widget.h
@@ -31,7 +31,7 @@ namespace Ultima1 {
namespace Widgets {
/**
- * Base class for widgets in urban maps
+ * Base class for widgets in urban maps
*/
class UrbanWidget : public Shared::Maps::MapWidget {
DECLARE_MESSAGE_MAP;
@@ -66,7 +66,7 @@ public:
/**
* Returns true if the given widget can move to a given position on the map
*/
- virtual CanMove canMoveTo(const Point &destPos);
+ virtual CanMove canMoveTo(const Point &destPos) override;
/**
* Handles loading and saving games
Commit: 57ea211fe0e38af562e347300a84c2693ef3affb
https://github.com/scummvm/scummvm/commit/57ea211fe0e38af562e347300a84c2693ef3affb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T23:15:31+01:00
Commit Message:
ULTIMA: More override keywords
Changed paths:
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/filesys/archive.h
engines/ultima/ultima8/filesys/archive_file.h
engines/ultima/ultima8/filesys/idata_source.h
engines/ultima/ultima8/filesys/odata_source.h
engines/ultima/ultima8/graphics/fonts/font.h
engines/ultima/ultima8/graphics/fonts/rendered_text.h
engines/ultima/ultima8/graphics/inverter_process.h
engines/ultima/ultima8/graphics/shape.h
engines/ultima/ultima8/gumps/movie_gump.h
engines/ultima/ultima8/gumps/shape_viewer_gump.h
engines/ultima/ultima8/kernel/allocator.h
engines/ultima/ultima8/kernel/core_app.h
engines/ultima/ultima8/kernel/delay_process.h
engines/ultima/ultima8/kernel/object.h
engines/ultima/ultima8/kernel/pool.h
engines/ultima/ultima8/kernel/process.h
engines/ultima/ultima8/misc/p_dynamic_cast.h
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/usecode/uc_process.h
engines/ultima/ultima8/world/actors/ambush_process.h
engines/ultima/ultima8/world/actors/avatar_gravity_process.h
engines/ultima/ultima8/world/actors/heal_process.h
engines/ultima/ultima8/world/actors/pathfinder_process.h
engines/ultima/ultima8/world/actors/scheduler_process.h
engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
engines/ultima/ultima8/world/egg_hatcher_process.h
engines/ultima/ultima8/world/fireball_process.h
engines/ultima/ultima8/world/gravity_process.h
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 632579e..5e8ac2e 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -86,7 +86,7 @@ public:
static void ConCmd_playSFX(const Console::ArgvType &argv);
- virtual void run();
+ virtual void run() override;
void playSFX(int sfxnum, int priority, ObjId objid, int loops,
bool no_duplicates, uint32 pitch_shift,
@@ -129,7 +129,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
private:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
uint32 paused;
//! play the next speech sample for the text in this SampleInfo
diff --git a/engines/ultima/ultima8/filesys/archive.h b/engines/ultima/ultima8/filesys/archive.h
index 2a1cfdb..ad5934f 100644
--- a/engines/ultima/ultima8/filesys/archive.h
+++ b/engines/ultima/ultima8/filesys/archive.h
@@ -37,7 +37,7 @@ namespace Pentagram {
class Archive {
public:
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
//! create Archive without any input sources
Archive();
diff --git a/engines/ultima/ultima8/filesys/archive_file.h b/engines/ultima/ultima8/filesys/archive_file.h
index a0dfaa9..ef912b9 100644
--- a/engines/ultima/ultima8/filesys/archive_file.h
+++ b/engines/ultima/ultima8/filesys/archive_file.h
@@ -33,7 +33,7 @@ class IDataSource;
class ArchiveFile {
public:
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
virtual ~ArchiveFile() { }
diff --git a/engines/ultima/ultima8/filesys/idata_source.h b/engines/ultima/ultima8/filesys/idata_source.h
index 1411420..fe15d96 100644
--- a/engines/ultima/ultima8/filesys/idata_source.h
+++ b/engines/ultima/ultima8/filesys/idata_source.h
@@ -196,7 +196,7 @@ public:
}
// Read a 2-byte value, hsb first.
- virtual uint16 read2high() {
+ virtual uint16 read2high() override {
return _in->readUint16BE();
}
diff --git a/engines/ultima/ultima8/filesys/odata_source.h b/engines/ultima/ultima8/filesys/odata_source.h
index 91d02b7..ff1c86b 100644
--- a/engines/ultima/ultima8/filesys/odata_source.h
+++ b/engines/ultima/ultima8/filesys/odata_source.h
@@ -146,7 +146,7 @@ public:
return _out->pos();
}
- virtual Common::WriteStream *GetRawStream() {
+ virtual Common::WriteStream *GetRawStream() override {
return _out;
}
};
@@ -171,46 +171,46 @@ public:
virtual ~OBufferDataSource() {};
- virtual void write1(uint32 val) {
+ virtual void write1(uint32 val) override {
*buf_ptr++ = val & 0xff;
};
- virtual void write2(uint16 val) {
+ virtual void write2(uint16 val) override {
*buf_ptr++ = val & 0xff;
*buf_ptr++ = (val >> 8) & 0xff;
};
- virtual void write2high(uint16 val) {
+ virtual void write2high(uint16 val) override {
*buf_ptr++ = (val >> 8) & 0xff;
*buf_ptr++ = val & 0xff;
};
- virtual void write3(uint32 val) {
+ virtual void write3(uint32 val) override {
*buf_ptr++ = val & 0xff;
*buf_ptr++ = (val >> 8) & 0xff;
*buf_ptr++ = (val >> 16) & 0xff;
};
- virtual void write4(uint32 val) {
+ virtual void write4(uint32 val) override {
*buf_ptr++ = val & 0xff;
*buf_ptr++ = (val >> 8) & 0xff;
*buf_ptr++ = (val >> 16) & 0xff;
*buf_ptr++ = (val >> 24) & 0xff;
};
- virtual void write4high(uint32 val) {
+ virtual void write4high(uint32 val) override {
*buf_ptr++ = (val >> 24) & 0xff;
*buf_ptr++ = (val >> 16) & 0xff;
*buf_ptr++ = (val >> 8) & 0xff;
*buf_ptr++ = val & 0xff;
};
- virtual void write(const void *b, uint32 len) {
+ virtual void write(const void *b, uint32 len) override {
Common::copy((const byte *)b, (const byte *)b + len, buf_ptr);
buf_ptr += len;
};
- virtual void seek(uint32 pos) {
+ virtual void seek(uint32 pos) override {
buf_ptr = const_cast<unsigned char *>(buf) + pos;
};
@@ -240,41 +240,41 @@ public:
return _out;
}
- virtual void write1(uint32 val) {
+ virtual void write1(uint32 val) override {
_out.push_back(static_cast<byte>(val & 0xff));
}
- virtual void write2(uint16 val) {
+ virtual void write2(uint16 val) override {
_out.push_back(static_cast<byte>(val & 0xff));
_out.push_back(static_cast<byte>((val >> 8) & 0xff));
}
- virtual void write2high(uint16 val) {
+ virtual void write2high(uint16 val) override {
_out.push_back(static_cast<byte>((val >> 8) & 0xff));
_out.push_back(static_cast<byte>(val & 0xff));
}
- virtual void write3(uint32 val) {
+ virtual void write3(uint32 val) override {
_out.push_back(static_cast<byte>(val & 0xff));
_out.push_back(static_cast<byte>((val >> 8) & 0xff));
_out.push_back(static_cast<byte>((val >> 16) & 0xff));
}
- virtual void write4(uint32 val) {
+ virtual void write4(uint32 val) override {
_out.push_back(static_cast<byte>(val & 0xff));
_out.push_back(static_cast<byte>((val >> 8) & 0xff));
_out.push_back(static_cast<byte>((val >> 16) & 0xff));
_out.push_back(static_cast<byte>((val >> 24) & 0xff));
}
- virtual void write4high(uint32 val) {
+ virtual void write4high(uint32 val) override {
_out.push_back(static_cast<byte>((val >> 24) & 0xff));
_out.push_back(static_cast<byte>((val >> 16) & 0xff));
_out.push_back(static_cast<byte>((val >> 8) & 0xff));
_out.push_back(static_cast<byte>(val & 0xff));
}
- virtual void write(const void *b, uint32 length) {
+ virtual void write(const void *b, uint32 length) override {
write(b, length, length);
}
@@ -290,7 +290,7 @@ public:
_out.clear();
}
- virtual void seek(uint32 /*pos*/) {
+ virtual void seek(uint32 /*pos*/) override {
/*_out->seekp(pos); FIXME: Do something here. */
}
virtual void skip(int32 /*pos*/) override {
diff --git a/engines/ultima/ultima8/graphics/fonts/font.h b/engines/ultima/ultima8/graphics/fonts/font.h
index 335aeae..3acc7d6 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.h
+++ b/engines/ultima/ultima8/graphics/fonts/font.h
@@ -46,7 +46,7 @@ public:
Font();
virtual ~Font();
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
enum TextAlign {
TEXT_LEFT,
diff --git a/engines/ultima/ultima8/graphics/fonts/rendered_text.h b/engines/ultima/ultima8/graphics/fonts/rendered_text.h
index ce31056..2489cb9 100644
--- a/engines/ultima/ultima8/graphics/fonts/rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/rendered_text.h
@@ -57,7 +57,7 @@ public:
return vlead;
}
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
protected:
int width, height;
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/graphics/inverter_process.h
index 38dae6f..ede83e8 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/graphics/inverter_process.h
@@ -43,7 +43,7 @@ public:
targetstate = target;
}
- virtual void run();
+ virtual void run() override;
static ProcId invertScreen();
static void ConCmd_invertScreen(const Console::ArgvType &argv);
@@ -52,7 +52,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
static InverterProcess *inverter;
unsigned int targetstate;
diff --git a/engines/ultima/ultima8/graphics/shape.h b/engines/ultima/ultima8/graphics/shape.h
index 483cfde..2f49e49 100644
--- a/engines/ultima/ultima8/graphics/shape.h
+++ b/engines/ultima/ultima8/graphics/shape.h
@@ -73,7 +73,7 @@ public:
static const ConvertShapeFormat *DetectShapeFormat(const uint8 *data, uint32 size);
static const ConvertShapeFormat *DetectShapeFormat(IDataSource *ds, uint32 size);
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
ENABLE_CUSTOM_MEMORY_ALLOCATION()
diff --git a/engines/ultima/ultima8/gumps/movie_gump.h b/engines/ultima/ultima8/gumps/movie_gump.h
index d233f62..6eca1b3 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.h
+++ b/engines/ultima/ultima8/gumps/movie_gump.h
@@ -41,16 +41,16 @@ public:
uint32 _Flags = 0, int32 layer = LAYER_MODAL);
virtual ~MovieGump(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- 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;
static ProcId U8MovieViewer(RawArchive *skf, bool introMusicHack = false);
@@ -59,7 +59,7 @@ public:
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
SKFPlayer *player;
};
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.h b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
index 19c7f26..5ab650f 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.h
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
@@ -44,17 +44,17 @@ public:
uint32 _Flags = 0, int32 layer = LAYER_MODAL);
virtual ~ShapeViewerGump(void);
- 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 bool OnKeyDown(int key, int mod) override;
+ virtual bool OnTextInput(int unicode) override;
static void U8ShapeViewer();
static void ConCmd_U8ShapeViewer(const Console::ArgvType &argv);
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
Std::vector<Std::pair<Std::string, ShapeArchive *> > flexes;
unsigned int curflex;
diff --git a/engines/ultima/ultima8/kernel/allocator.h b/engines/ultima/ultima8/kernel/allocator.h
index 4fa6c83..92b5a1e 100644
--- a/engines/ultima/ultima8/kernel/allocator.h
+++ b/engines/ultima/ultima8/kernel/allocator.h
@@ -34,7 +34,7 @@ public:
Allocator();
virtual ~Allocator();
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
virtual void *allocate(size_t size) = 0;
diff --git a/engines/ultima/ultima8/kernel/core_app.h b/engines/ultima/ultima8/kernel/core_app.h
index 217b8f3..cda6c26 100644
--- a/engines/ultima/ultima8/kernel/core_app.h
+++ b/engines/ultima/ultima8/kernel/core_app.h
@@ -47,7 +47,7 @@ struct GameInfo;
class CoreApp {
public:
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
CoreApp(const Ultima::UltimaGameDescription *gameDesc);
virtual ~CoreApp();
diff --git a/engines/ultima/ultima8/kernel/delay_process.h b/engines/ultima/ultima8/kernel/delay_process.h
index 6bcbf01..17bfd0f 100644
--- a/engines/ultima/ultima8/kernel/delay_process.h
+++ b/engines/ultima/ultima8/kernel/delay_process.h
@@ -40,13 +40,13 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int count;
};
diff --git a/engines/ultima/ultima8/kernel/object.h b/engines/ultima/ultima8/kernel/object.h
index 46e976a..542ae2a 100644
--- a/engines/ultima/ultima8/kernel/object.h
+++ b/engines/ultima/ultima8/kernel/object.h
@@ -38,7 +38,7 @@ public:
virtual ~Object();
// p_dynamic_cast stuff
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
// memory pooling stuff
ENABLE_CUSTOM_MEMORY_ALLOCATION()
diff --git a/engines/ultima/ultima8/kernel/pool.h b/engines/ultima/ultima8/kernel/pool.h
index 5f105ed..f01a00e 100644
--- a/engines/ultima/ultima8/kernel/pool.h
+++ b/engines/ultima/ultima8/kernel/pool.h
@@ -34,7 +34,7 @@ public:
virtual ~Pool();
// p_dynamic_cast stuff
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
virtual void *allocate(size_t size) = 0;
virtual void deallocate(void *ptr) = 0;
diff --git a/engines/ultima/ultima8/kernel/process.h b/engines/ultima/ultima8/kernel/process.h
index d2eb534..c7be2bd 100644
--- a/engines/ultima/ultima8/kernel/process.h
+++ b/engines/ultima/ultima8/kernel/process.h
@@ -42,7 +42,7 @@ public:
virtual ~Process() { }
// p_dynamic_cast stuff
- ENABLE_RUNTIME_CLASSTYPE()
+ ENABLE_RUNTIME_CLASSTYPE_BASE()
// memory pooling stuff
ENABLE_CUSTOM_MEMORY_ALLOCATION()
diff --git a/engines/ultima/ultima8/misc/p_dynamic_cast.h b/engines/ultima/ultima8/misc/p_dynamic_cast.h
index 3361ccb..5c4f806 100644
--- a/engines/ultima/ultima8/misc/p_dynamic_cast.h
+++ b/engines/ultima/ultima8/misc/p_dynamic_cast.h
@@ -44,6 +44,13 @@ struct RunTimeClassType {
//
#define ENABLE_RUNTIME_CLASSTYPE() \
static const RunTimeClassType ClassType; \
+ virtual bool IsOfType(const RunTimeClassType & type) override; \
+ virtual bool IsOfType(const char * type) override; \
+ template<class Type> inline bool IsOfType() { return IsOfType(Type::ClassType); } \
+ virtual const RunTimeClassType & GetClassType() override { return ClassType; }
+
+#define ENABLE_RUNTIME_CLASSTYPE_BASE() \
+ static const RunTimeClassType ClassType; \
virtual bool IsOfType(const RunTimeClassType & type); \
virtual bool IsOfType(const char * type); \
template<class Type> inline bool IsOfType() { return IsOfType(Type::ClassType); } \
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index f2cb317..7b03487 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -80,11 +80,11 @@ class AudioMixer;
class Ultima8Engine : public Shared::UltimaEngine, public CoreApp {
private:
Std::list<ObjId> textmodes; //!< Gumps that want text mode
-
+
/**
* Does engine deinitialization
*/
- void deinitialize();
+ void deinitialize() override;
// Load and save games from arbitrary filenames from the console
static void ConCmd_saveGame(const Console::ArgvType &argv); //!< "Ultima8Engine::saveGame <optional filename>" console command
@@ -209,7 +209,7 @@ protected:
virtual bool initialize() override;
- virtual void DeclareArgs();
+ virtual void DeclareArgs() override;
/**
* Returns the data archive folder and version that's required
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index 008ac64..6127bdf 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -47,9 +47,9 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
- virtual void terminate();
+ virtual void terminate() override;
void freeOnTerminate(uint16 index, int type_);
@@ -58,11 +58,11 @@ public:
}
//! dump some info about this process to pout
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void load(uint16 classid_, uint16 offset_, uint32 this_ptr = 0,
int thissize = 0, const uint8 *args = 0, int argsize = 0);
diff --git a/engines/ultima/ultima8/world/actors/ambush_process.h b/engines/ultima/ultima8/world/actors/ambush_process.h
index f43eced..2a2d34a 100644
--- a/engines/ultima/ultima8/world/actors/ambush_process.h
+++ b/engines/ultima/ultima8/world/actors/ambush_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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 delaycount;
};
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
index 95ff961..6378864 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
bool cling;
};
diff --git a/engines/ultima/ultima8/world/actors/heal_process.h b/engines/ultima/ultima8/world/actors/heal_process.h
index c0c69e8..f0dce05 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.h
+++ b/engines/ultima/ultima8/world/actors/heal_process.h
@@ -36,13 +36,13 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
INTRINSIC(I_feedAvatar);
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void feedAvatar(uint16 food);
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.h b/engines/ultima/ultima8/world/actors/pathfinder_process.h
index 2cde440..7be8280 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.h
@@ -42,14 +42,14 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
- virtual void terminate();
+ virtual void run() override;
+ virtual void terminate() override;
// virtual void terminate();
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int32 targetx, targety, targetz;
ObjId targetitem;
diff --git a/engines/ultima/ultima8/world/actors/scheduler_process.h b/engines/ultima/ultima8/world/actors/scheduler_process.h
index 6a71af7..17f70a2 100644
--- a/engines/ultima/ultima8/world/actors/scheduler_process.h
+++ b/engines/ultima/ultima8/world/actors/scheduler_process.h
@@ -36,11 +36,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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 lastRun;
uint16 nextActor;
diff --git a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
index 4815894..c4f6864 100644
--- a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
+++ b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
@@ -37,12 +37,12 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
int mapnum;
int teleport_id;
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.h b/engines/ultima/ultima8/world/egg_hatcher_process.h
index 33cb90e..a3624c73 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.h
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.h
@@ -39,14 +39,14 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
void addEgg(Egg *egg);
void addEgg(uint16 egg);
bool loadData(IDataSource *ids, uint32 version);
private:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
Std::vector<uint16> eggs;
};
diff --git a/engines/ultima/ultima8/world/fireball_process.h b/engines/ultima/ultima8/world/fireball_process.h
index 080db42..873c235c 100644
--- a/engines/ultima/ultima8/world/fireball_process.h
+++ b/engines/ultima/ultima8/world/fireball_process.h
@@ -39,15 +39,15 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
- virtual void terminate();
+ virtual void terminate() override;
INTRINSIC(I_TonysBalls);
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void explode();
diff --git a/engines/ultima/ultima8/world/gravity_process.h b/engines/ultima/ultima8/world/gravity_process.h
index 76cec29..3265b17 100644
--- a/engines/ultima/ultima8/world/gravity_process.h
+++ b/engines/ultima/ultima8/world/gravity_process.h
@@ -44,14 +44,14 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
- virtual void terminate();
+ virtual void run() override;
+ virtual void terminate() override;
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void fallStopped();
Commit: 611e5b4c0db40d2cf948f3d8015d061e640cb893
https://github.com/scummvm/scummvm/commit/611e5b4c0db40d2cf948f3d8015d061e640cb893
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T23:15:31+01:00
Commit Message:
ULTIMA: Firther work on override keywords addition
Changed paths:
engines/ultima/ultima8/gumps/book_gump.h
engines/ultima/ultima8/gumps/gump_notify_process.h
engines/ultima/ultima8/gumps/readable_gump.h
engines/ultima/ultima8/gumps/target_gump.h
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
engines/ultima/ultima8/world/actors/avatar_death_process.h
engines/ultima/ultima8/world/actors/avatar_mover_process.h
engines/ultima/ultima8/world/actors/clear_feign_death_process.h
engines/ultima/ultima8/world/actors/combat_process.h
engines/ultima/ultima8/world/actors/grant_peace_process.h
engines/ultima/ultima8/world/actors/loiter_process.h
engines/ultima/ultima8/world/actors/main_actor.h
engines/ultima/ultima8/world/actors/resurrection_process.h
engines/ultima/ultima8/world/camera_process.h
engines/ultima/ultima8/world/destroy_item_process.h
engines/ultima/ultima8/world/split_item_process.h
diff --git a/engines/ultima/ultima8/gumps/book_gump.h b/engines/ultima/ultima8/gumps/book_gump.h
index da6cf52..dc8975d 100644
--- a/engines/ultima/ultima8/gumps/book_gump.h
+++ b/engines/ultima/ultima8/gumps/book_gump.h
@@ -42,13 +42,13 @@ public:
virtual ~BookGump();
// Go to the next page on mouse click
- virtual void OnMouseClick(int button, int32 mx, int32 my);
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
// Close on double click
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual void OnMouseDouble(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;
INTRINSIC(I_readBook);
@@ -58,7 +58,7 @@ protected:
public:
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/gump_notify_process.h b/engines/ultima/ultima8/gumps/gump_notify_process.h
index 28580b2..ddd0119 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.h
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.h
@@ -48,15 +48,15 @@ public:
virtual void notifyClosing(int res);
- virtual void terminate();
+ virtual void terminate() override;
- virtual void run();
+ virtual void run() override;
- virtual void dumpInfo();
+ virtual void dumpInfo() 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/readable_gump.h b/engines/ultima/ultima8/gumps/readable_gump.h
index 7674276..fde6cff 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.h
+++ b/engines/ultima/ultima8/gumps/readable_gump.h
@@ -42,18 +42,18 @@ public:
virtual ~ReadableGump();
// Close on mouse click on key press
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual bool OnKeyDown(int key, int mod);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual bool OnKeyDown(int key, int mod) 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;
INTRINSIC(I_readGrave);
INTRINSIC(I_readPlaque);
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/target_gump.h b/engines/ultima/ultima8/gumps/target_gump.h
index de9952b..a5ce202 100644
--- a/engines/ultima/ultima8/gumps/target_gump.h
+++ b/engines/ultima/ultima8/gumps/target_gump.h
@@ -41,17 +41,17 @@ public:
virtual ~TargetGump(void);
- virtual bool PointOnGump(int mx, int my);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void Close(bool no_del = false);
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void OnMouseUp(int button, int32 mx, int32 my);
+ virtual bool PointOnGump(int mx, int my) override;
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void Close(bool no_del = false) override;
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void OnMouseUp(int button, int32 mx, int32 my) override;
INTRINSIC(I_target);
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
private:
bool target_tracing;
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 7b03487..350ebe0 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -245,11 +245,11 @@ public:
return screen;
}
- virtual void runGame();
+ virtual void runGame() override;
virtual void handleEvent(const Common::Event &event);
- virtual void paint();
- virtual bool isPainting() {
+ virtual void paint() override;
+ virtual bool isPainting() override {
return painting;
}
@@ -337,7 +337,7 @@ public:
*/
virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
- bool saveGame();
+ bool saveGame() override;
//! save a game
//! \param filename the file to save to
@@ -345,7 +345,7 @@ public:
bool saveGame(Std::string filename, Std::string desc,
bool ignore_modals = false);
- bool loadGame();
+ bool loadGame() override;
//! load a game
//! \param filename the savegame to load
diff --git a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
index 5d58446..17ef63e 100644
--- a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
@@ -36,11 +36,11 @@ public:
ActorBarkNotifyProcess(uint16 it);
virtual ~ActorBarkNotifyProcess(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;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.h b/engines/ultima/ultima8/world/actors/avatar_death_process.h
index 90b3d03..b814826 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.h
@@ -37,11 +37,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.h b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
index f173a92..5e6853a 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
@@ -38,7 +38,7 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
void OnMouseDown(int button, int32 mx, int32 my);
void OnMouseUp(int button);
@@ -49,7 +49,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void handleHangingMode();
void handleCombatMode();
diff --git a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
index 7682eca..87b70cc 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/combat_process.h b/engines/ultima/ultima8/world/actors/combat_process.h
index 566699b..466a7b6 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.h
+++ b/engines/ultima/ultima8/world/actors/combat_process.h
@@ -38,19 +38,19 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
- virtual void terminate();
+ virtual void terminate() override;
ObjId getTarget();
void setTarget(ObjId target_);
ObjId seekTarget();
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
bool isValidTarget(Actor *target_);
bool isEnemy(Actor *target_);
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.h b/engines/ultima/ultima8/world/actors/grant_peace_process.h
index 44ea34f..875b109 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.h
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.h
@@ -39,13 +39,13 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
INTRINSIC(I_castGrantPeace);
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
bool havetarget;
};
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.h b/engines/ultima/ultima8/world/actors/loiter_process.h
index f68f738..485cbc2 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.h
+++ b/engines/ultima/ultima8/world/actors/loiter_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
int32 count;
};
diff --git a/engines/ultima/ultima8/world/actors/main_actor.h b/engines/ultima/ultima8/world/actors/main_actor.h
index 78f6fc8..cdc8fed 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.h
+++ b/engines/ultima/ultima8/world/actors/main_actor.h
@@ -35,11 +35,11 @@ public:
MainActor();
virtual ~MainActor();
- virtual bool CanAddItem(Item *item, bool checkwghtvol = false);
- virtual bool addItem(Item *item, bool checkwghtvol = false);
+ virtual bool CanAddItem(Item *item, bool checkwghtvol = false) override;
+ virtual bool addItem(Item *item, bool checkwghtvol = false) override;
//! teleport to the given location on the given map
- virtual void teleport(int mapNum_, int32 x_, int32 y_, int32 z_);
+ virtual void teleport(int mapNum_, int32 x_, int32 y_, int32 z_) override;
//! teleport to a teleport-destination egg
//! \param mapnum The map to teleport to
@@ -66,20 +66,20 @@ public:
void accumulateInt(int n);
//! Get the GravityProcess of this Item, creating it if necessary
- virtual GravityProcess *ensureGravityProcess();
+ virtual GravityProcess *ensureGravityProcess() override;
- virtual uint32 getArmourClass();
- virtual uint16 getDefenseType();
- virtual int16 getAttackingDex();
- virtual int16 getDefendingDex();
+ virtual uint32 getArmourClass() override;
+ virtual uint16 getDefenseType() override;
+ virtual int16 getAttackingDex() override;
+ virtual int16 getDefendingDex() override;
- virtual uint16 getDamageType();
- virtual int getDamageAmount();
+ virtual uint16 getDamageType() override;
+ virtual int getDamageAmount() override;
- virtual void setInCombat();
- virtual void clearInCombat();
+ virtual void setInCombat() override;
+ virtual void clearInCombat() override;
- virtual ProcId die(uint16 DamageType);
+ virtual ProcId die(uint16 DamageType) override;
Std::string getName() {
return name;
@@ -138,7 +138,7 @@ public:
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
void useInventoryItem(uint32 shapenum);
diff --git a/engines/ultima/ultima8/world/actors/resurrection_process.h b/engines/ultima/ultima8/world/actors/resurrection_process.h
index 8d1e0fb..d89cbe3 100644
--- a/engines/ultima/ultima8/world/actors/resurrection_process.h
+++ b/engines/ultima/ultima8/world/actors/resurrection_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/camera_process.h b/engines/ultima/ultima8/world/camera_process.h
index c5b632a..4907d25 100644
--- a/engines/ultima/ultima8/world/camera_process.h
+++ b/engines/ultima/ultima8/world/camera_process.h
@@ -51,7 +51,7 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
// You will notice that this isn't the same as how Item::GetLerped works
void GetLerped(int32 &x, int32 &y, int32 &z, int32 factor, bool noupdate = false);
@@ -81,11 +81,11 @@ public:
void ItemMoved();
- virtual void terminate(); // Terminate NOW!
+ virtual void terminate() override; // Terminate NOW!
bool loadData(IDataSource *ids, uint32 version);
private:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int32 sx, sy, sz;
int32 ex, ey, ez;
diff --git a/engines/ultima/ultima8/world/destroy_item_process.h b/engines/ultima/ultima8/world/destroy_item_process.h
index 12b7b98..1121f1c 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.h
+++ b/engines/ultima/ultima8/world/destroy_item_process.h
@@ -42,11 +42,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/split_item_process.h b/engines/ultima/ultima8/world/split_item_process.h
index 1744478..8f7297d 100644
--- a/engines/ultima/ultima8/world/split_item_process.h
+++ b/engines/ultima/ultima8/world/split_item_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
ObjId target;
};
Commit: 5e6d684aa9c80bf09dcd753bf61b5a1869aba006
https://github.com/scummvm/scummvm/commit/5e6d684aa9c80bf09dcd753bf61b5a1869aba006
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T23:15:31+01:00
Commit Message:
ULTIMA: More work on override keywords
Changed paths:
engines/ultima/ultima8/audio/music_process.h
engines/ultima/ultima8/graphics/palette_fader_process.h
engines/ultima/ultima8/gumps/game_map_gump.h
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/gumps/main_menu_process.h
engines/ultima/ultima8/gumps/modal_gump.h
engines/ultima/ultima8/world/actors/actor.h
engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
engines/ultima/ultima8/world/container.h
engines/ultima/ultima8/world/egg.h
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/sprite_process.h
engines/ultima/ultima8/world/teleport_egg.h
diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h
index aeb5f31..b8660ed 100644
--- a/engines/ultima/ultima8/audio/music_process.h
+++ b/engines/ultima/ultima8/audio/music_process.h
@@ -40,7 +40,7 @@ class MusicProcess : public Process {
MUSIC_PLAY_WANTED = 3
};
private:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
//! Play a music track
//! \param track The track number to play. Pass 0 to stop music
@@ -84,7 +84,7 @@ public:
return _wantedTrack;
}
- virtual void run();
+ virtual void run() override;
bool loadData(IDataSource *ids, uint32 version);
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/graphics/palette_fader_process.h
index e3fa6ca..80158db 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.h
@@ -48,7 +48,7 @@ public:
PaletteFaderProcess(int16 from[12], int16 to[12], int priority, int frames);
virtual ~PaletteFaderProcess(void);
- virtual void run();
+ virtual void run() override;
INTRINSIC(I_fadeToPaletteTransform);
INTRINSIC(I_fadeToBlack);
@@ -59,7 +59,7 @@ public:
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/game_map_gump.h b/engines/ultima/ultima8/gumps/game_map_gump.h
index 7ab59c4..27f22de 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.h
+++ b/engines/ultima/ultima8/gumps/game_map_gump.h
@@ -44,13 +44,13 @@ public:
GameMapGump(int x, int y, int w, int h);
virtual ~GameMapGump();
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
void GetCameraLocation(int32 &x, int32 &y, int32 &z,
int lerp_factor = 256);
// Trace a click, and return ObjId (parent coord space)
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
// Trace a click, return ObjId, and the coordinates of the mouse click (gump coord space)
virtual uint16 TraceCoordinates(int mx, int my, int32 coords[3],
@@ -60,18 +60,18 @@ public:
// Get the location of an item in the gump (coords relative to this).
// Returns false on failure
virtual bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
- int32 lerp_factor = 256);
+ int32 lerp_factor = 256) override;
- virtual bool StartDraggingItem(Item *item, int mx, int my);
- virtual bool DraggingItem(Item *item, int mx, int my);
- virtual void DraggingItemLeftGump(Item *item);
- virtual void StopDraggingItem(Item *item, bool moved);
- virtual void DropItem(Item *item, int mx, int my);
+ virtual bool StartDraggingItem(Item *item, int mx, int my) override;
+ virtual bool DraggingItem(Item *item, int mx, int my) override;
+ virtual void DraggingItemLeftGump(Item *item) override;
+ virtual void StopDraggingItem(Item *item, bool moved) override;
+ virtual void DropItem(Item *item, int mx, int my) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseUp(int button, int32 mx, int32 my);
- virtual void OnMouseClick(int button, int32 mx, int32 my);
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseUp(int button, int32 mx, int32 my) override;
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+ virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
void IncSortOrder(int count);
@@ -90,10 +90,10 @@ public:
static void ConCmd_incrementSortOrder(const Console::ArgvType &argv);
static void ConCmd_decrementSortOrder(const Console::ArgvType &argv);
- virtual void RenderSurfaceChanged();
+ virtual void RenderSurfaceChanged() override;
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
bool display_dragging;
uint32 dragging_shape;
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index add3976..ed354a3 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -462,7 +462,7 @@ public:
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/main_menu_process.h b/engines/ultima/ultima8/gumps/main_menu_process.h
index 195bd9b..6441d69 100644
--- a/engines/ultima/ultima8/gumps/main_menu_process.h
+++ b/engines/ultima/ultima8/gumps/main_menu_process.h
@@ -38,11 +38,11 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- 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;
bool init;
};
diff --git a/engines/ultima/ultima8/gumps/modal_gump.h b/engines/ultima/ultima8/gumps/modal_gump.h
index 7e5846e..1c5b998 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.h
+++ b/engines/ultima/ultima8/gumps/modal_gump.h
@@ -39,19 +39,19 @@ public:
~ModalGump();
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual void Close(bool no_del = false);
+ virtual void Close(bool no_del = false) override;
- virtual bool PointOnGump(int mx, int my);
- virtual Gump *FindGump(int mx, int my);
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual bool PointOnGump(int mx, int my) override;
+ virtual Gump *FindGump(int mx, int my) override;
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) 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/world/actors/actor.h b/engines/ultima/ultima8/world/actors/actor.h
index dc4b7b6..9e6fa05 100644
--- a/engines/ultima/ultima8/world/actors/actor.h
+++ b/engines/ultima/ultima8/world/actors/actor.h
@@ -146,7 +146,7 @@ public:
virtual void teleport(int mapnum, int32 x, int32 y, int32 z);
- virtual bool removeItem(Item *item);
+ virtual bool removeItem(Item *item) override;
//! \return the PID of the spawned usecode process if any (otherwise 0)
uint16 schedule(uint32 time);
@@ -159,7 +159,7 @@ public:
virtual int16 getAttackingDex();
virtual int16 getDefendingDex();
- virtual uint16 getDamageType();
+ virtual uint16 getDamageType() override;
virtual int getDamageAmount();
//! calculate the damage an attack against this Actor does.
@@ -172,7 +172,7 @@ public:
//! receive a hit
//! \param damage base damage (or zero to use attacker's default damage)
//! \param type damage type (or zero to use attacker's default type)
- virtual void receiveHit(uint16 other, int dir, int damage, uint16 type);
+ virtual void receiveHit(uint16 other, int dir, int damage, uint16 type) override;
//! die
//! \param damageType damage type that caused the death
@@ -212,9 +212,9 @@ public:
//! create an actor, assign objid, make it ethereal and load monster stats.
static Actor *createActor(uint32 shape, uint32 frame);
- virtual uint16 assignObjId(); // assign an NPC objid
+ virtual uint16 assignObjId() override; // assign an NPC objid
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
@@ -292,7 +292,7 @@ public:
};
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int16 strength;
int16 dexterity;
diff --git a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
index bf4d903..f405078 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
@@ -38,8 +38,8 @@ public:
// p_dynamic_cast stuff
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
- virtual void terminate();
+ virtual void run() override;
+ virtual void terminate() override;
static bool isQuarterSpeed() {
return quarter;
@@ -76,7 +76,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int dx, dy, dz, dir;
static ProcId amp[6];
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index 28ef2a3..27050f5 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -76,7 +76,7 @@ public:
void destroyContents();
//! Set flag on container and all its contents recursively
- virtual void setFlagRecursively(uint32 mask);
+ virtual void setFlagRecursively(uint32 mask) override;
//! Search the container for items matching the given loopscript.
//! \param itemlist The matching items are appended to this list
@@ -88,7 +88,7 @@ public:
//! Get the weight of the container and its contents
//! \return weight
- virtual uint32 getTotalWeight();
+ virtual uint32 getTotalWeight() override;
//! Get the container's capacity
virtual uint32 getCapacity();
@@ -98,15 +98,15 @@ public:
//! Assign self and contents an objID
//! \return the assiged ID
- virtual ObjId assignObjId();
+ virtual ObjId assignObjId() override;
//! Clear objIDs of self and contents
- virtual void clearObjId();
+ virtual void clearObjId() override;
//! Destroy self
- virtual void destroy(bool delnow = false);
+ virtual void destroy(bool delnow = false) override;
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
@@ -115,7 +115,7 @@ public:
protected:
//! save Container data
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
Std::list<Item *> contents;
};
diff --git a/engines/ultima/ultima8/world/egg.h b/engines/ultima/ultima8/world/egg.h
index 08258a2..28198e8 100644
--- a/engines/ultima/ultima8/world/egg.h
+++ b/engines/ultima/ultima8/world/egg.h
@@ -56,14 +56,14 @@ public:
virtual uint16 hatch();
//! The item has left the fast area
- virtual void leaveFastArea();
+ virtual void leaveFastArea() override;
//! clear the 'hatched' flag
void reset() {
hatched = false;
}
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
@@ -75,7 +75,7 @@ public:
INTRINSIC(I_setEggId);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
bool hatched;
};
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index 96a2ca6..7ce62df 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -440,7 +440,7 @@ public:
virtual void leaveFastArea();
//! dump some info about this item to pout
- virtual void dumpInfo();
+ virtual void dumpInfo() override;
bool loadData(IDataSource *ids, uint32 version);
@@ -561,7 +561,7 @@ protected:
ProcId gravitypid; // Item's GravityTracker (or 0)
//! save the actual Item data
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
private:
diff --git a/engines/ultima/ultima8/world/sprite_process.h b/engines/ultima/ultima8/world/sprite_process.h
index 6fd6e5f..2bb6b84 100644
--- a/engines/ultima/ultima8/world/sprite_process.h
+++ b/engines/ultima/ultima8/world/sprite_process.h
@@ -64,7 +64,7 @@ public:
virtual ~SpriteProcess(void);
//! The SpriteProcess run function
- virtual void run();
+ virtual void run() override;
INTRINSIC(I_createSprite);
// INTRINSIC(I_createSpriteEx);
@@ -75,7 +75,7 @@ protected:
public:
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/world/teleport_egg.h b/engines/ultima/ultima8/world/teleport_egg.h
index b6e0034..4bf09ec 100644
--- a/engines/ultima/ultima8/world/teleport_egg.h
+++ b/engines/ultima/ultima8/world/teleport_egg.h
@@ -45,9 +45,9 @@ public:
bool loadData(IDataSource *ids, uint32 version);
- virtual uint16 hatch();
+ virtual uint16 hatch() override;
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
More information about the Scummvm-git-logs
mailing list