libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 00:42:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

XEEN: Add override keywords

Browse Source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:34 +01:00
parent 80166c0fea
commit 1bcdcabb29
17 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/xeen/detection.cpp
View File

@ -120,23 +120,23 @@ public:
_maxScanDepth = 3;
}
virtual const char *getEngineId() const override {
const char *getEngineId() const override {
return "xeen";
}
virtual const char *getName() const override {
const char *getName() const override {
return "Xeen";
}
virtual const char *getOriginalCopyright() const override {
const char *getOriginalCopyright() const override {
return "Xeen (C) 1992-1993 New World Computing, Inc.";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual SaveStateList listSaves(const char *target) const override;
virtual int getMaximumSaveSlot() const override;
virtual void removeSaveState(const char *target, int slot) const override;
bool hasFeature(MetaEngineFeature f) const override;
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};

4
engines/xeen/dialogs/dialogs.h
View File

@ -88,7 +88,7 @@ protected:
* @param fadeIn If true, does an initial fade in
* @returns True if key or mouse pressed
*/
virtual bool doScroll(bool rollUp, bool fadeIn);
bool doScroll(bool rollUp, bool fadeIn) override;
/**
* Load a set of text strings from the given resource
@ -144,7 +144,7 @@ protected:
public:
SettingsBaseDialog(XeenEngine *vm) : ButtonContainer(vm) {}
virtual ~SettingsBaseDialog() {}
~SettingsBaseDialog() override {}
};
} // End of namespace Xeen

2
engines/xeen/dialogs/dialogs_spells.h
View File

@ -86,7 +86,7 @@ private:
int _oldMode;
private:
CastSpell(XeenEngine *vm);
~CastSpell();
~CastSpell() override;
int execute(Character *&c);

34
engines/xeen/files.h
View File

@ -139,17 +139,17 @@ public:
File(const Common::String &filename);
File(const Common::String &filename, int ccMode);
File(const Common::String &filename, Common::Archive &archive);
virtual ~File() {}
~File() override {}
/**
* Opens the given file, throwing an error if it can't be opened
*/
virtual bool open(const Common::String &filename);
bool open(const Common::String &filename) override;
/**
* Opens the given file, throwing an error if it can't be opened
*/
virtual bool open(const Common::String &filename, Common::Archive &archive);
bool open(const Common::String &filename, Common::Archive &archive) override;
/**
* Opens the given file, throwing an error if it can't be opened
@ -159,14 +159,14 @@ public:
/**
* Opens the given file
*/
virtual bool open(const Common::FSNode &node) {
bool open(const Common::FSNode &node) override {
return Common::File::open(node);
}
/**
* Opens the given file
*/
virtual bool open(SeekableReadStream *stream, const Common::String &name) {
bool open(SeekableReadStream *stream, const Common::String &name) override {
return Common::File::open(stream, name);
}
@ -217,12 +217,12 @@ public:
_parentStream(parentStream), _begin(parentStream->pos()) {
}
virtual uint32 write(const void *dataPtr, uint32 dataSize) {
uint32 write(const void *dataPtr, uint32 dataSize) override {
return _parentStream->write(dataPtr, dataSize);
}
virtual bool flush() { return _parentStream->flush(); }
virtual void finalize() {}
virtual int32 pos() const { return _parentStream->pos() - _begin; }
bool flush() override { return _parentStream->flush(); }
void finalize() override {}
int32 pos() const override { return _parentStream->pos() - _begin; }
};
class StringArray : public Common::StringArray {
@ -290,9 +290,9 @@ public:
BaseCCArchive() {}
// Archive implementation
virtual bool hasFile(const Common::String &name) const;
virtual int listMembers(Common::ArchiveMemberList &list) const;
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
bool hasFile(const Common::String &name) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
};
/**
@ -304,14 +304,14 @@ private:
Common::String _prefix;
bool _encoded;
protected:
virtual bool getHeaderEntry(const Common::String &resourceName, CCEntry &ccEntry) const;
bool getHeaderEntry(const Common::String &resourceName, CCEntry &ccEntry) const override;
public:
CCArchive(const Common::String &filename, bool encoded);
CCArchive(const Common::String &filename, const Common::String &prefix, bool encoded);
virtual ~CCArchive();
~CCArchive() override;
// Archive implementation
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
};
class SaveArchive : public BaseCCArchive {
@ -323,7 +323,7 @@ private:
Common::HashMap<uint16, Common::MemoryWriteStreamDynamic *> _newData;
public:
SaveArchive(Party *party);
~SaveArchive();
~SaveArchive() override;
/**
* Sets up the dynamic data for the game for a new game
@ -333,7 +333,7 @@ public:
/**
* Archive implementation
*/
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
/**
* Archive implementation

2
engines/xeen/font.h
View File

@ -81,7 +81,7 @@ public:
public:
FontSurface();
FontSurface(int wv, int hv);
virtual ~FontSurface() {}
~FontSurface() override {}
/**
* Draws a symbol to the surface.

2
engines/xeen/interface.h
View File

@ -178,7 +178,7 @@ public:
public:
Interface(XeenEngine *vm);
virtual ~Interface() {}
~Interface() override {}
void setup();

32
engines/xeen/item.h
View File

@ -241,26 +241,26 @@ protected:
/**
* Returns a text string listing all the stats/attributes of a given item
*/
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
Common::String getAttributes(XeenItem &item, const Common::String &classes) override;
public:
WeaponItems(Character *character) : InventoryItems(character, CATEGORY_WEAPON) {}
virtual ~WeaponItems() {}
~WeaponItems() override {}
/**
* Equip a given weapon
*/
virtual void equipItem(int itemIndex);
void equipItem(int itemIndex) override;
/**
* Assembles a full lines description for a specified item for use in
* the Items dialog
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
Common::String getFullDescription(int itemIndex, int displayNum) override;
/**
* Enchants a weapon
*/
virtual void enchantItem(int itemIndex, int amount);
void enchantItem(int itemIndex, int amount) override;
/**
* Returns true if the character has an Elder weapon in Swords of Xeen
@ -273,26 +273,26 @@ protected:
/**
* Returns a text string listing all the stats/attributes of a given item
*/
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
Common::String getAttributes(XeenItem &item, const Common::String &classes) override;
public:
ArmorItems(Character *character) : InventoryItems(character, CATEGORY_ARMOR) {}
virtual ~ArmorItems() {}
~ArmorItems() override {}
/**
* Equip a given piece of armor
*/
virtual void equipItem(int itemIndex);
void equipItem(int itemIndex) override;
/**
* Assembles a full lines description for a specified item for use in
* the Items dialog
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
Common::String getFullDescription(int itemIndex, int displayNum) override;
/**
* Enchants an armor
*/
virtual void enchantItem(int itemIndex, int amount);
void enchantItem(int itemIndex, int amount) override;
};
class AccessoryItems : public InventoryItems {
@ -300,20 +300,20 @@ protected:
/**
* Returns a text string listing all the stats/attributes of a given item
*/
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
Common::String getAttributes(XeenItem &item, const Common::String &classes) override;
public:
AccessoryItems(Character *character) : InventoryItems(character, CATEGORY_ACCESSORY) {}
/**
* Equip a given accessory
*/
virtual void equipItem(int itemIndex);
void equipItem(int itemIndex) override;
/**
* Assembles a full lines description for a specified item for use in
* the Items dialog
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
Common::String getFullDescription(int itemIndex, int displayNum) override;
};
class MiscItems : public InventoryItems {
@ -321,16 +321,16 @@ protected:
/**
* Returns a text string listing all the stats/attributes of a given item
*/
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
Common::String getAttributes(XeenItem &item, const Common::String &classes) override;
public:
MiscItems(Character *character) : InventoryItems(character, CATEGORY_MISC) {}
virtual ~MiscItems() {}
~MiscItems() override {}
/**
* Assembles a full lines description for a specified item for use in
* the Items dialog
*/
virtual Common::String getFullDescription(int itemIndex, int displayNum);
Common::String getFullDescription(int itemIndex, int displayNum) override;
};
class InventoryItemsGroup {

68
engines/xeen/locations.h
View File

@ -82,7 +82,7 @@ protected:
virtual void farewell() {}
public:
BaseLocation(LocationAction action);
virtual ~BaseLocation();
~BaseLocation() override;
/**
* Show the town location
@ -110,20 +110,20 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Draw the visual background
*/
virtual void drawBackground();
void drawBackground() override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
BankLocation();
virtual ~BankLocation() {}
~BankLocation() override {}
};
class BlacksmithLocation : public BaseLocation {
@ -131,20 +131,20 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Handle any farewell
*/
virtual void farewell();
void farewell() override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
BlacksmithLocation();
virtual ~BlacksmithLocation() {}
~BlacksmithLocation() override {}
};
class GuildLocation : public BaseLocation {
@ -152,15 +152,15 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
GuildLocation();
virtual ~GuildLocation() {}
~GuildLocation() override {}
};
class TavernLocation : public BaseLocation {
@ -173,20 +173,20 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Handle any farewell
*/
virtual void farewell();
void farewell() override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
TavernLocation();
virtual ~TavernLocation() {}
~TavernLocation() override {}
};
class TempleLocation : public BaseLocation {
@ -204,15 +204,15 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
TempleLocation();
virtual ~TempleLocation() {}
~TempleLocation() override {}
};
class TrainingLocation : public BaseLocation {
@ -225,26 +225,26 @@ protected:
/**
* Generates the display text for the location, for a given character
*/
virtual Common::String createLocationText(Character &ch);
Common::String createLocationText(Character &ch) override;
/**
* Handles options for the particular location
*/
virtual Character *doOptions(Character *c);
Character *doOptions(Character *c) override;
public:
TrainingLocation();
virtual ~TrainingLocation() {}
~TrainingLocation() override {}
};
class ArenaLocation : public BaseLocation {
public:
ArenaLocation();
virtual ~ArenaLocation() {}
~ArenaLocation() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
class CutsceneLocation : public BaseLocation {
@ -271,12 +271,12 @@ private:
void getNewLocation();
public:
ReaperCutscene();
virtual ~ReaperCutscene() {}
~ReaperCutscene() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
class GolemCutscene : public CutsceneLocation {
@ -287,12 +287,12 @@ private:
void getNewLocation();
public:
GolemCutscene();
virtual ~GolemCutscene() {}
~GolemCutscene() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
class DwarfCutscene : public CutsceneLocation {
@ -303,12 +303,12 @@ private:
void getNewLocation();
public:
DwarfCutscene();
virtual ~DwarfCutscene() {}
~DwarfCutscene() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
class SphinxCutscene : public CutsceneLocation {
@ -319,23 +319,23 @@ private:
void getNewLocation();
public:
SphinxCutscene();
virtual ~SphinxCutscene() {}
~SphinxCutscene() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
class PyramidLocation : public BaseLocation {
public:
PyramidLocation();
virtual ~PyramidLocation() {}
~PyramidLocation() override {}
/**
* Show the town location
*/
virtual int show();
int show() override;
};
} // End of namespace Locations

4
engines/xeen/screen.h
View File

@ -58,13 +58,13 @@ private:
void updatePalette(const byte *pal, int start, int count16);
public:
Screen(XeenEngine *vm);
virtual ~Screen() {}
~Screen() override {}
/**
* Base method that descendent classes can override for recording affected
* dirty areas of the surface
*/
virtual void addDirtyRect(const Common::Rect &r) { Graphics::Screen::addDirtyRect(r); }
void addDirtyRect(const Common::Rect &r) override { Graphics::Screen::addDirtyRect(r); }
/**
* Load a palette resource into the temporary palette

48
engines/xeen/sound_driver_adlib.h
View File

@ -106,35 +106,35 @@ private:
*/
byte calculateLevel(byte level, bool isFx);
protected:
virtual bool musSetInstrument(const byte *&srcP, byte param);
virtual bool musSetPitchWheel(const byte *&srcP, byte param);
virtual bool musSetPanning(const byte *&srcP, byte param);
virtual bool musFade(const byte *&srcP, byte param);
virtual bool musStartNote(const byte *&srcP, byte param);
virtual bool musSetVolume(const byte *&srcP, byte param);
virtual bool musInjectMidi(const byte *&srcP, byte param);
virtual bool musPlayInstrument(const byte *&srcP, byte param);
bool musSetInstrument(const byte *&srcP, byte param) override;
bool musSetPitchWheel(const byte *&srcP, byte param) override;
bool musSetPanning(const byte *&srcP, byte param) override;
bool musFade(const byte *&srcP, byte param) override;
bool musStartNote(const byte *&srcP, byte param) override;
bool musSetVolume(const byte *&srcP, byte param) override;
bool musInjectMidi(const byte *&srcP, byte param) override;
bool musPlayInstrument(const byte *&srcP, byte param) override;
virtual bool fxSetInstrument(const byte *&srcP, byte param);
virtual bool fxSetVolume(const byte *&srcP, byte param);
virtual bool fxMidiReset(const byte *&srcP, byte param);
virtual bool fxMidiDword(const byte *&srcP, byte param);
virtual bool fxSetPanning(const byte *&srcP, byte param);
virtual bool fxChannelOff(const byte *&srcP, byte param);
virtual bool fxFade(const byte *&srcP, byte param);
virtual bool fxStartNote(const byte *&srcP, byte param);
virtual bool fxInjectMidi(const byte *&srcP, byte param);
virtual bool fxPlayInstrument(const byte *&srcP, byte param);
bool fxSetInstrument(const byte *&srcP, byte param) override;
bool fxSetVolume(const byte *&srcP, byte param) override;
bool fxMidiReset(const byte *&srcP, byte param) override;
bool fxMidiDword(const byte *&srcP, byte param) override;
bool fxSetPanning(const byte *&srcP, byte param) override;
bool fxChannelOff(const byte *&srcP, byte param) override;
bool fxFade(const byte *&srcP, byte param) override;
bool fxStartNote(const byte *&srcP, byte param) override;
bool fxInjectMidi(const byte *&srcP, byte param) override;
bool fxPlayInstrument(const byte *&srcP, byte param) override;
/**
* Post-processing done when a pause countdown starts or is in progress
*/
virtual void pausePostProcess();
void pausePostProcess() override;
/**
* Does a reset of any sound effect
*/
virtual void resetFX();
void resetFX() override;
public:
/**
* Constructor
@ -144,22 +144,22 @@ public:
/**
* Destructor
*/
virtual ~SoundDriverAdlib();
~SoundDriverAdlib() override;
/**
* Starts an special effect playing
*/
virtual void playFX(uint effectId, const byte *data);
void playFX(uint effectId, const byte *data) override;
/**
* Plays a song
*/
virtual void playSong(const byte *data);
void playSong(const byte *data) override;
/**
* Executes special music command
*/
virtual int songCommand(uint commandId, byte musicVolume = 0, byte sfxVolume = 0);
int songCommand(uint commandId, byte musicVolume = 0, byte sfxVolume = 0) override;
};
} // End of namespace Xeen

10
engines/xeen/sprites.h
View File

@ -215,7 +215,7 @@ protected:
/**
* Output a pixel
*/
virtual void drawPixel(byte *dest, byte pixel) override;
void drawPixel(byte *dest, byte pixel) override;
public:
/**
* Constructor
@ -235,7 +235,7 @@ private:
/**
* Output a pixel
*/
virtual void drawPixel(byte *dest, byte pixel) override;
void drawPixel(byte *dest, byte pixel) override;
public:
/**
* Constructor
@ -250,7 +250,7 @@ protected:
/**
* Output a pixel
*/
virtual void drawPixel(byte *dest, byte pixel) override;
void drawPixel(byte *dest, byte pixel) override;
public:
/**
* Constructor
@ -273,7 +273,7 @@ protected:
/**
* Output a pixel
*/
virtual void drawPixel(byte *dest, byte pixel) override;
void drawPixel(byte *dest, byte pixel) override;
public:
/**
* Constructor
@ -288,7 +288,7 @@ protected:
/**
* Output a pixel
*/
virtual void drawPixel(byte *dest, byte pixel) override;
void drawPixel(byte *dest, byte pixel) override;
public:
/**
* Constructor

12
engines/xeen/swordsofxeen/swordsofxeen.h
View File

@ -43,7 +43,7 @@ protected:
/**
* Show the starting sequence/intro
*/
virtual void showStartup() {
void showStartup() override {
// Swords of Xeen doesn't have a starting title or intro
_gameMode = GMODE_MENU;
}
@ -51,25 +51,25 @@ protected:
/**
* Show the startup menu
*/
virtual void showMainMenu();
void showMainMenu() override;
/**
* Death cutscene
*/
virtual void death();
void death() override;
public:
SwordsOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc);
virtual ~SwordsOfXeenEngine() {}
~SwordsOfXeenEngine() override {}
/**
* Show a cutscene
*/
virtual void showCutscene(const Common::String &name, int status, uint score);
void showCutscene(const Common::String &name, int status, uint score) override;
/**
* Dream sequence
*/
virtual void dream();
void dream() override;
};
#define SWORDS_VM (*(::Xeen::SwordsOfXeen::SwordsOfXeenEngine *)g_vm)

4
engines/xeen/window.h
View File

@ -98,9 +98,9 @@ public:
Window(const Window &src);
Window(const Common::Rect &bounds, int a, int border,
int xLo, int ycL, int xHi, int ycH);
virtual ~Window() {}
~Window() override {}
virtual void addDirtyRect(const Common::Rect &r);
void addDirtyRect(const Common::Rect &r) override;
void setBounds(const Common::Rect &r);

12
engines/xeen/worldofxeen/worldofxeen.h
View File

@ -39,30 +39,30 @@ protected:
/**
* Show the starting sequence/intro
*/
virtual void showStartup();
void showStartup() override;
/**
* Show the startup menu
*/
virtual void showMainMenu();
void showMainMenu() override;
/**
* Death cutscene
*/
virtual void death();
void death() override;
public:
WorldOfXeenEngine(OSystem *syst, const XeenGameDescription *gameDesc);
virtual ~WorldOfXeenEngine() {}
~WorldOfXeenEngine() override {}
/**
* Show a cutscene
*/
virtual void showCutscene(const Common::String &name, int status, uint score);
void showCutscene(const Common::String &name, int status, uint score) override;
/**
* Dream sequence
*/
virtual void dream();
void dream() override;
};
#define WOX_VM (*(::Xeen::WorldOfXeen::WorldOfXeenEngine *)g_vm)

48
engines/xeen/worldofxeen/worldofxeen_menu.h
View File

@ -87,12 +87,12 @@ protected:
/**
* Called when the menu screen is first shown
*/
virtual void display();
void display() override;
/**
* Shows the main menu dialog
*/
virtual void showMenuDialog();
void showMenuDialog() override;
public:
CloudsMainMenuContainer();
};
@ -104,12 +104,12 @@ protected:
/**
* Called when the menu screen is first shown
*/
virtual void display();
void display() override;
/**
* Shows the main menu dialog
*/
virtual void showMenuDialog();
void showMenuDialog() override;
public:
DarkSideMainMenuContainer();
};
@ -119,12 +119,12 @@ protected:
/**
* Called when the menu screen is first shown
*/
virtual void display();
void display() override;
/**
* Shows the main menu dialog
*/
virtual void showMenuDialog();
void showMenuDialog() override;
public:
WorldOfXeenMainMenuContainer();
};
@ -134,12 +134,12 @@ protected:
/**
* Called when the menu screen is first shown
*/
virtual void display();
void display() override;
/**
* Shows the main menu dialog
*/
virtual void showMenuDialog();
void showMenuDialog() override;
public:
WorldOfXeenCDMainMenuContainer();
};
@ -156,7 +156,7 @@ public:
/**
* Destructor
*/
virtual ~MenuContainerDialog() {
~MenuContainerDialog() override {
_owner->setOwner(nullptr);
}
@ -181,17 +181,17 @@ public:
/**
* Destructor
*/
virtual ~MainMenuDialog() {}
~MainMenuDialog() override {}
/**
* Draws the dialog
*/
virtual void draw() = 0;
void draw() override = 0;
/**
* Handles events
*/
virtual bool handleEvents();
bool handleEvents() override;
};
@ -212,17 +212,17 @@ public:
/**
* Destructor
*/
virtual ~CloudsMenuDialog();
~CloudsMenuDialog() override;
/**
* Draws the dialog
*/
virtual void draw();
void draw() override;
/**
* Handles events
*/
virtual bool handleEvents();
bool handleEvents() override;
};
class DarkSideMenuDialog : public MainMenuDialog {
@ -243,17 +243,17 @@ public:
/**
* Destructor
*/
virtual ~DarkSideMenuDialog();
~DarkSideMenuDialog() override;
/**
* Draws the dialog
*/
virtual void draw();
void draw() override;
/**
* Handles events
*/
virtual bool handleEvents();
bool handleEvents() override;
};
class WorldMenuDialog : public MainMenuDialog {
@ -273,17 +273,17 @@ public:
/**
* Destructor
*/
virtual ~WorldMenuDialog();
~WorldMenuDialog() override;
/**
* Draws the dialog
*/
virtual void draw();
void draw() override;
/**
* Handles events
*/
virtual bool handleEvents();
bool handleEvents() override;
};
class OtherOptionsDialog : public MenuContainerDialog {
@ -303,17 +303,17 @@ public:
/**
* Destructor
*/
virtual ~OtherOptionsDialog();
~OtherOptionsDialog() override;
/**
* Draws the dialog
*/
virtual void draw();
void draw() override;
/**
* Handles events
*/
virtual bool handleEvents();
bool handleEvents() override;
};
} // End of namespace WorldOfXeen

16
engines/xeen/xeen.h
View File

@ -131,8 +131,8 @@ private:
void loadSettings();
// Engine APIs
virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
/**
* Outer gameplay loop responsible for dispatching control to game-specific
@ -198,7 +198,7 @@ public:
ExtendedOptions _extOptions;
public:
XeenEngine(OSystem *syst, const XeenGameDescription *gameDesc);
virtual ~XeenEngine();
~XeenEngine() override;
/**
* Returns the features
@ -259,27 +259,27 @@ public:
/**
* Load a savegame
*/
virtual Common::Error loadGameState(int slot) override;
Common::Error loadGameState(int slot) override;
/**
* Save the game
*/
virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
Common::Error saveGameState(int slot, const Common::String &desc) override;
/**
* Updates sound settings
*/
virtual void syncSoundSettings() override;
void syncSoundSettings() override;
/**
* Returns true if a savegame can currently be loaded
*/
virtual bool canLoadGameStateCurrently() override;
bool canLoadGameStateCurrently() override;
/**
* Returns true if the game can currently be saved
*/
virtual bool canSaveGameStateCurrently() override;
bool canSaveGameStateCurrently() override;
/**
* Show a cutscene

6
engines/xeen/xsurface.h
View File

@ -32,20 +32,20 @@ namespace Xeen {
class BaseSurface: public Graphics::ManagedSurface {
public:
virtual void addDirtyRect(const Common::Rect &r) {
void addDirtyRect(const Common::Rect &r) override {
Graphics::ManagedSurface::addDirtyRect(r);
}
public:
BaseSurface() : Graphics::ManagedSurface() {}
BaseSurface(int width, int height) : Graphics::ManagedSurface(width, height) {}
virtual ~BaseSurface() {}
~BaseSurface() override {}
};
class XSurface : public BaseSurface {
public:
XSurface() : BaseSurface() {}
XSurface(int width, int height) : BaseSurface(width, height) {}
virtual ~XSurface() {}
~XSurface() override {}
};
} // End of namespace Xeen