aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/adl/adl_v2.h36
-rw-r--r--engines/adl/adl_v3.h4
-rw-r--r--engines/adl/adl_v4.h32
-rw-r--r--engines/adl/adl_v5.h14
-rw-r--r--engines/adl/detection.cpp16
-rw-r--r--engines/adl/display_a2.h14
-rw-r--r--engines/adl/graphics.h16
-rw-r--r--engines/adl/hires6.cpp24
8 files changed, 78 insertions, 78 deletions
diff --git a/engines/adl/adl_v2.h b/engines/adl/adl_v2.h
index 564b4dc8f1..f244ac430f 100644
--- a/engines/adl/adl_v2.h
+++ b/engines/adl/adl_v2.h
@@ -35,20 +35,20 @@ protected:
AdlEngine_v2(OSystem *syst, const AdlGameDescription *gd);
// AdlEngine
- virtual void setupOpcodeTables();
- virtual void initState();
- byte roomArg(byte room) const;
- void advanceClock();
- virtual void printString(const Common::String &str);
- virtual Common::String loadMessage(uint idx) const;
- void drawItems();
- void drawItem(Item &item, const Common::Point &pos);
- void loadRoom(byte roomNr);
- virtual void showRoom();
- void takeItem(byte noun);
+ void setupOpcodeTables() override;
+ void initState() override;
+ byte roomArg(byte room) const override;
+ void advanceClock() override;
+ void printString(const Common::String &str) override;
+ Common::String loadMessage(uint idx) const override;
+ void drawItems() override;
+ void drawItem(Item &item, const Common::Point &pos) override;
+ void loadRoom(byte roomNr) override;
+ void showRoom() override;
+ void takeItem(byte noun) override;
// Engine
- bool canSaveGameStateCurrently();
+ bool canSaveGameStateCurrently() override;
void insertDisk(byte volume);
virtual DataBlockPtr readDataBlockPtr(Common::ReadStream &f) const;
@@ -69,13 +69,13 @@ protected:
virtual int o_isNounNotInRoom(ScriptEnv &e);
virtual int o_isCarryingSomething(ScriptEnv &e);
- virtual int o_moveItem(ScriptEnv &e) override;
- virtual int o_setCurPic(ScriptEnv &e) override;
- virtual int o_setPic(ScriptEnv &e) override;
+ int o_moveItem(ScriptEnv &e) override;
+ int o_setCurPic(ScriptEnv &e) override;
+ int o_setPic(ScriptEnv &e) override;
virtual int o_moveAllItems(ScriptEnv &e);
- virtual int o_save(ScriptEnv &e) override;
- virtual int o_restore(ScriptEnv &e) override ;
- virtual int o_placeItem(ScriptEnv &e) override;
+ int o_save(ScriptEnv &e) override;
+ int o_restore(ScriptEnv &e) override ;
+ int o_placeItem(ScriptEnv &e) override;
virtual int o_tellTime(ScriptEnv &e);
virtual int o_setRoomFromVar(ScriptEnv &e);
virtual int o_initDisk(ScriptEnv &e);
diff --git a/engines/adl/adl_v3.h b/engines/adl/adl_v3.h
index 3bb890875b..9d5cb00436 100644
--- a/engines/adl/adl_v3.h
+++ b/engines/adl/adl_v3.h
@@ -35,11 +35,11 @@ protected:
AdlEngine_v3(OSystem *syst, const AdlGameDescription *gd);
// AdlEngine
- Common::String getItemDescription(const Item &item) const;
+ Common::String getItemDescription(const Item &item) const override;
void loadItemDescriptions(Common::SeekableReadStream &stream, byte count);
- virtual int o_isNounNotInRoom(ScriptEnv &e) override;
+ int o_isNounNotInRoom(ScriptEnv &e) override;
Common::Array<Common::String> _itemDesc;
};
diff --git a/engines/adl/adl_v4.h b/engines/adl/adl_v4.h
index 0c90c02307..f4ee8c9a3e 100644
--- a/engines/adl/adl_v4.h
+++ b/engines/adl/adl_v4.h
@@ -49,17 +49,17 @@ protected:
AdlEngine_v4(OSystem *syst, const AdlGameDescription *gd);
// AdlEngine
- virtual void setupOpcodeTables();
- virtual void gameLoop();
- virtual void loadState(Common::ReadStream &stream);
- virtual void saveState(Common::WriteStream &stream);
- virtual Common::String loadMessage(uint idx) const;
- virtual Common::String getItemDescription(const Item &item) const;
- virtual void switchRegion(byte region);
- virtual void switchRoom(byte roomNr);
+ void setupOpcodeTables() override;
+ void gameLoop() override;
+ void loadState(Common::ReadStream &stream) override;
+ void saveState(Common::WriteStream &stream) override;
+ Common::String loadMessage(uint idx) const override;
+ Common::String getItemDescription(const Item &item) const override;
+ void switchRegion(byte region) override;
+ void switchRoom(byte roomNr) override;
// AdlEngine_v2
- virtual void adjustDataBlockPtr(byte &track, byte &sector, byte &offset, byte &size) const;
+ void adjustDataBlockPtr(byte &track, byte &sector, byte &offset, byte &size) const override;
enum RegionChunkType {
kRegionChunkUnknown,
@@ -85,17 +85,17 @@ protected:
void backupVars();
void restoreVars();
- virtual int o_isItemInRoom(ScriptEnv &e) override;
+ int o_isItemInRoom(ScriptEnv &e) override;
virtual int o_isVarGT(ScriptEnv &e);
- virtual int o_moveItem(ScriptEnv &e) override;
+ int o_moveItem(ScriptEnv &e) override;
virtual int o_setRegionToPrev(ScriptEnv &e);
- virtual int o_moveAllItems(ScriptEnv &e) override;
+ int o_moveAllItems(ScriptEnv &e) override;
virtual int o_setRegion(ScriptEnv &e);
- virtual int o_save(ScriptEnv &e) override;
- virtual int o_restore(ScriptEnv &e) override;
- virtual int o_restart(ScriptEnv &e) override;
+ int o_save(ScriptEnv &e) override;
+ int o_restore(ScriptEnv &e) override;
+ int o_restart(ScriptEnv &e) override;
virtual int o_setRegionRoom(ScriptEnv &e);
- virtual int o_setRoomPic(ScriptEnv &e) override;
+ int o_setRoomPic(ScriptEnv &e) override;
Common::Array<RegionLocation> _regionLocations;
Common::Array<RegionInitDataOffset> _regionInitDataOffsets;
diff --git a/engines/adl/adl_v5.h b/engines/adl/adl_v5.h
index 536f664f31..70d5b4f0b8 100644
--- a/engines/adl/adl_v5.h
+++ b/engines/adl/adl_v5.h
@@ -35,19 +35,19 @@ protected:
AdlEngine_v5(OSystem *syst, const AdlGameDescription *gd);
// AdlEngine
- virtual void setupOpcodeTables();
+ void setupOpcodeTables() override;
// AdlEngine_v4
- virtual RegionChunkType getRegionChunkType(const uint16 addr) const;
- virtual void initRoomState(RoomState &roomState) const;
- virtual byte restoreRoomState(byte room);
+ RegionChunkType getRegionChunkType(const uint16 addr) const override;
+ void initRoomState(RoomState &roomState) const override;
+ byte restoreRoomState(byte room) override;
- virtual int o_isNounNotInRoom(ScriptEnv &e) override;
+ int o_isNounNotInRoom(ScriptEnv &e) override;
virtual int o_abortScript(ScriptEnv &e);
virtual int o_dummy(ScriptEnv &e);
virtual int o_setTextMode(ScriptEnv &e);
- virtual int o_setRegionRoom(ScriptEnv &e) override;
- virtual int o_setRoomPic(ScriptEnv &e) override;
+ int o_setRegionRoom(ScriptEnv &e) override;
+ int o_setRoomPic(ScriptEnv &e) override;
};
} // End of namespace Adl
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 7d9b03fb6b..4eaebc713e 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -319,24 +319,24 @@ class AdlMetaEngine : public AdvancedMetaEngine {
public:
AdlMetaEngine() : AdvancedMetaEngine(gameFileDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { }
- const char *getName() const {
+ const char *getName() const override {
return "ADL";
}
- const char *getOriginalCopyright() const {
+ const char *getOriginalCopyright() const override {
return "Copyright (C) Sierra On-Line";
}
- bool hasFeature(MetaEngineFeature f) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- int getMaximumSaveSlot() const { return 'O' - 'A'; }
- SaveStateList listSaves(const char *target) const;
- void removeSaveState(const char *target, int slot) const;
+ bool hasFeature(MetaEngineFeature f) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ int getMaximumSaveSlot() const override { return 'O' - 'A'; }
+ SaveStateList listSaves(const char *target) const override;
+ void removeSaveState(const char *target, int slot) const override;
ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const override;
bool addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const;
- bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
+ bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
};
bool AdlMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/adl/display_a2.h b/engines/adl/display_a2.h
index 5823c2410b..52c7970d26 100644
--- a/engines/adl/display_a2.h
+++ b/engines/adl/display_a2.h
@@ -41,8 +41,8 @@ public:
kTextHeight = 24
};
- virtual void init() override;
- virtual bool saveThumbnail(Common::WriteStream &out) override;
+ void init() override;
+ bool saveThumbnail(Common::WriteStream &out) override;
// Graphics
uint getGfxWidth() const { return kGfxWidth; }
@@ -59,14 +59,14 @@ public:
void clear(byte color);
// Text
- virtual char asciiToNative(char c) const override { return c | 0x80; }
- virtual void printChar(char c) override;
- virtual void showCursor(bool enable);
+ char asciiToNative(char c) const override { return c | 0x80; }
+ void printChar(char c) override;
+ void showCursor(bool enable) override;
private:
void writeFrameBuffer(const Common::Point &p, byte color, byte mask);
- virtual void updateTextSurface() override;
- virtual void updateGfxSurface() override;
+ void updateTextSurface() override;
+ void updateGfxSurface() override;
void showScanlines(bool enable);
void drawChar(byte c, int x, int y);
diff --git a/engines/adl/graphics.h b/engines/adl/graphics.h
index ad56281598..d67ba8273e 100644
--- a/engines/adl/graphics.h
+++ b/engines/adl/graphics.h
@@ -54,10 +54,10 @@ public:
GraphicsMan_v1<T>(T &display) : _display(display) { this->setBounds(Common::Rect(280, 160)); }
- virtual void drawLine(const Common::Point &p1, const Common::Point &p2, byte color) const override;
- virtual void drawShape(Common::ReadStream &shape, Common::Point &pos, byte rotation = 0, byte scaling = 1, byte color = 0x7f) const override;
- virtual void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) override;
- virtual void clearScreen() const override;
+ void drawLine(const Common::Point &p1, const Common::Point &p2, byte color) const override;
+ void drawShape(Common::ReadStream &shape, Common::Point &pos, byte rotation = 0, byte scaling = 1, byte color = 0x7f) const override;
+ void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) override;
+ void clearScreen() const override;
protected:
T &_display;
@@ -78,7 +78,7 @@ public:
using GraphicsMan_v1<T>::putPixel;
GraphicsMan_v2<T>(T &display) : GraphicsMan_v1<T>(display), _color(0) { }
- void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos);
+ void drawPic(Common::SeekableReadStream &pic, const Common::Point &pos) override;
protected:
bool canFillAt(const Common::Point &p, const bool stopBit = false);
@@ -94,7 +94,7 @@ private:
void fill(Common::SeekableReadStream &pic);
virtual void fillRowLeft(Common::Point p, const byte pattern, const bool stopBit);
virtual void fillAt(Common::Point p, const byte pattern);
- virtual byte getClearColor() const override { return 0xff; }
+ byte getClearColor() const override { return 0xff; }
byte _color;
Common::Point _offset;
@@ -113,8 +113,8 @@ public:
GraphicsMan_v3<T>(T &display) : GraphicsMan_v2<T>(display) { }
private:
- virtual void fillRowLeft(Common::Point p, const byte pattern, const bool stopBit) override;
- virtual void fillAt(Common::Point p, const byte pattern) override;
+ void fillRowLeft(Common::Point p, const byte pattern, const bool stopBit) override;
+ void fillAt(Common::Point p, const byte pattern) override;
};
template <class T>
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index 29d7ea35c6..da5b4655c2 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -44,23 +44,23 @@ public:
private:
// AdlEngine
- void gameLoop();
- void setupOpcodeTables();
- void runIntro();
- void init();
- void initGameState();
- void showRoom();
+ void gameLoop() override;
+ void setupOpcodeTables() override;
+ void runIntro() override;
+ void init() override;
+ void initGameState() override;
+ void showRoom() override;
int goDirection(ScriptEnv &e, Direction dir) override;
- Common::String formatVerbError(const Common::String &verb) const;
- Common::String formatNounError(const Common::String &verb, const Common::String &noun) const;
- void loadState(Common::ReadStream &stream);
- void saveState(Common::WriteStream &stream);
+ Common::String formatVerbError(const Common::String &verb) const override;
+ Common::String formatNounError(const Common::String &verb, const Common::String &noun) const override;
+ void loadState(Common::ReadStream &stream) override;
+ void saveState(Common::WriteStream &stream) override;
// AdlEngine_v2
- void printString(const Common::String &str);
+ void printString(const Common::String &str) override;
// Engine
- bool canSaveGameStateCurrently();
+ bool canSaveGameStateCurrently() override;
int o_fluteSound(ScriptEnv &e);