diff --git a/engines/cryomni3d/cryomni3d.h b/engines/cryomni3d/cryomni3d.h index fe4879fb4a4..387a5a02c94 100644 --- a/engines/cryomni3d/cryomni3d.h +++ b/engines/cryomni3d/cryomni3d.h @@ -99,11 +99,11 @@ enum DragStatus { class CryOmni3DEngine : public ::Engine { protected: - virtual Common::Error run() override; + Common::Error run() override; public: CryOmni3DEngine(OSystem *syst, const CryOmni3DGameDescription *gamedesc); - virtual ~CryOmni3DEngine(); + ~CryOmni3DEngine() override; // Detection related functions const CryOmni3DGameDescription *_gameDescription; diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp index ea1ffa23f25..3e9d644952d 100644 --- a/engines/cryomni3d/detection.cpp +++ b/engines/cryomni3d/detection.cpp @@ -99,19 +99,19 @@ public: return "cryomni3d"; } - virtual const char *getName() const override { + const char *getName() const override { return "Cryo Omni3D"; } - virtual const char *getOriginalCopyright() const override { + const char *getOriginalCopyright() const override { return "Cryo game Engine (C) 1997-2002 Cryo Interactive"; } - 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 { return 999; } - 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 { return 999; } + void removeSaveState(const char *target, int slot) const override; }; bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const { diff --git a/engines/cryomni3d/image/codecs/hlz.h b/engines/cryomni3d/image/codecs/hlz.h index d8edc63af93..680a6ad4049 100644 --- a/engines/cryomni3d/image/codecs/hlz.h +++ b/engines/cryomni3d/image/codecs/hlz.h @@ -35,10 +35,10 @@ namespace Image { class HLZDecoder : public Codec { public: HLZDecoder(int width, int height); - ~HLZDecoder(); + ~HLZDecoder() override; - const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream); - Graphics::PixelFormat getPixelFormat() const; + const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream) override; + Graphics::PixelFormat getPixelFormat() const override; static void decodeFrameInPlace(Common::SeekableReadStream &stream, uint32 size, byte *dst); diff --git a/engines/cryomni3d/image/hlz.h b/engines/cryomni3d/image/hlz.h index 411f7521db6..aed6e342181 100644 --- a/engines/cryomni3d/image/hlz.h +++ b/engines/cryomni3d/image/hlz.h @@ -41,14 +41,14 @@ class HLZDecoder; class HLZFileDecoder : public ImageDecoder { public: HLZFileDecoder(); - virtual ~HLZFileDecoder(); + ~HLZFileDecoder() override; // ImageDecoder API - void destroy(); - virtual bool loadStream(Common::SeekableReadStream &stream); - virtual const Graphics::Surface *getSurface() const { return _surface; } - const byte *getPalette() const { return _palette; } - uint16 getPaletteColorCount() const { return 256; } + void destroy() override; + bool loadStream(Common::SeekableReadStream &stream) override; + const Graphics::Surface *getSurface() const override { return _surface; } + const byte *getPalette() const override { return _palette; } + uint16 getPaletteColorCount() const override { return 256; } private: HLZDecoder *_codec; diff --git a/engines/cryomni3d/sprites.h b/engines/cryomni3d/sprites.h index 8713da136fc..b97f12466bb 100644 --- a/engines/cryomni3d/sprites.h +++ b/engines/cryomni3d/sprites.h @@ -65,17 +65,17 @@ public: private: class CryoCursor : public Graphics::Cursor { public: - virtual uint16 getWidth() const override { return _width; } - virtual uint16 getHeight() const override { return _height; } - virtual uint16 getHotspotX() const override { return _offX; } - virtual uint16 getHotspotY() const override { return _offY; } - virtual byte getKeyColor() const override { return 0; } + uint16 getWidth() const override { return _width; } + uint16 getHeight() const override { return _height; } + uint16 getHotspotX() const override { return _offX; } + uint16 getHotspotY() const override { return _offY; } + byte getKeyColor() const override { return 0; } - virtual const byte *getSurface() const override { return _data; } + const byte *getSurface() const override { return _data; } - virtual const byte *getPalette() const override { return nullptr; } - virtual byte getPaletteStartIndex() const override { return 0; } - virtual uint16 getPaletteCount() const override { return 0; } + const byte *getPalette() const override { return nullptr; } + byte getPaletteStartIndex() const override { return 0; } + uint16 getPaletteCount() const override { return 0; } uint setup(uint16 width, uint16 height); @@ -90,7 +90,7 @@ private: uint refCnt; CryoCursor(); - virtual ~CryoCursor(); + ~CryoCursor() override; }; // Pointer to avoid to mutate Sprites when asking for a cursor diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h index 8de1e1d5806..a711c870d1f 100644 --- a/engines/cryomni3d/versailles/engine.h +++ b/engines/cryomni3d/versailles/engine.h @@ -226,29 +226,29 @@ protected: public: CryOmni3DEngine_Versailles(OSystem *syst, const CryOmni3DGameDescription *gamedesc); - virtual ~CryOmni3DEngine_Versailles(); + ~CryOmni3DEngine_Versailles() override; - virtual void initializePath(const Common::FSNode &gamePath) override; + void initializePath(const Common::FSNode &gamePath) override; bool hasFeature(EngineFeature f) const override; - virtual Common::Error loadGameState(int slot) override; - virtual Common::Error saveGameState(int slot, const Common::String &desc) override; + Common::Error loadGameState(int slot) override; + Common::Error saveGameState(int slot, const Common::String &desc) override; Common::String prepareFileName(const Common::String &baseName, const char *extension) const { const char *const extensions[] = { extension, nullptr }; return prepareFileName(baseName, extensions); } - virtual Common::String prepareFileName(const Common::String &baseName, + Common::String prepareFileName(const Common::String &baseName, const char *const *extensions) const override; void setupPalette(const byte *colors, uint start, uint num) override { setupPalette(colors, start, num, true); } void makeTranslucent(Graphics::Surface &dst, const Graphics::Surface &src) const override; - virtual bool displayToolbar(const Graphics::Surface *original) override { return _toolbar.displayToolbar(original); }; - virtual bool hasPlaceDocumentation() override; - virtual bool displayPlaceDocumentation() override; - virtual uint displayOptions() override; - virtual bool shouldAbort() override; + bool displayToolbar(const Graphics::Surface *original) override { return _toolbar.displayToolbar(original); }; + bool hasPlaceDocumentation() override; + bool displayPlaceDocumentation() override; + uint displayOptions() override; + bool shouldAbort() override; private: void setupFonts(); diff --git a/engines/cryomni3d/video/hnm_decoder.h b/engines/cryomni3d/video/hnm_decoder.h index 695488f670b..9a569ba9eaf 100644 --- a/engines/cryomni3d/video/hnm_decoder.h +++ b/engines/cryomni3d/video/hnm_decoder.h @@ -44,10 +44,10 @@ namespace Video { class HNMDecoder : public VideoDecoder { public: HNMDecoder(bool loop = false, byte *initialPalette = nullptr); - virtual ~HNMDecoder(); - bool loadStream(Common::SeekableReadStream *stream); - void readNextPacket(); - void close(); + ~HNMDecoder() override; + bool loadStream(Common::SeekableReadStream *stream) override; + void readNextPacket() override; + void close() override; void setRegularFrameDelay(uint32 regularFrameDelay) { _regularFrameDelay = regularFrameDelay; } @@ -56,19 +56,19 @@ private: public: HNM4VideoTrack(uint32 width, uint32 height, uint32 frameSize, uint32 frameCount, uint32 regularFrameDelay, const byte *initialPalette = nullptr); - ~HNM4VideoTrack(); + ~HNM4VideoTrack() override; // When _frameCount is 0, it means we are looping - bool endOfTrack() const { return (_frameCount == 0) ? false : VideoTrack::endOfTrack(); } - uint16 getWidth() const { return _surface.w; } - uint16 getHeight() const { return _surface.h; } - Graphics::PixelFormat getPixelFormat() const { return _surface.format; } - int getCurFrame() const { return _curFrame; } - int getFrameCount() const { return _frameCount; } - uint32 getNextFrameStartTime() const { return _nextFrameStartTime; } - const Graphics::Surface *decodeNextFrame() { return &_surface; } - const byte *getPalette() const { _dirtyPalette = false; return _palette; } - bool hasDirtyPalette() const { return _dirtyPalette; } + bool endOfTrack() const override { return (_frameCount == 0) ? false : VideoTrack::endOfTrack(); } + uint16 getWidth() const override { return _surface.w; } + uint16 getHeight() const override { return _surface.h; } + Graphics::PixelFormat getPixelFormat() const override { return _surface.format; } + int getCurFrame() const override { return _curFrame; } + int getFrameCount() const override { return _frameCount; } + uint32 getNextFrameStartTime() const override { return _nextFrameStartTime; } + const Graphics::Surface *decodeNextFrame() override { return &_surface; } + const byte *getPalette() const override { _dirtyPalette = false; return _palette; } + bool hasDirtyPalette() const override { return _dirtyPalette; } /** Decode a video chunk. */ void decodePalette(Common::SeekableReadStream *stream, uint32 size); @@ -100,11 +100,11 @@ private: public: DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate, Audio::Mixer::SoundType soundType); - ~DPCMAudioTrack(); + ~DPCMAudioTrack() override; Audio::Timestamp decodeSound(Common::SeekableReadStream *stream, uint32 size); protected: - Audio::AudioStream *getAudioStream() const { return _audioStream; } + Audio::AudioStream *getAudioStream() const override { return _audioStream; } private: Audio::QueuingAudioStream *_audioStream; bool _gotLUT;