libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 07:41:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRYOMNI3D: Add override keywords

Browse Source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:28 +01:00
parent 62b7979cd9
commit 5737e22fde
7 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/cryomni3d/cryomni3d.h
View File

@ -99,11 +99,11 @@ enum DragStatus {
class CryOmni3DEngine : public ::Engine { class CryOmni3DEngine : public ::Engine {
protected: protected:
virtual Common::Error run() override; Common::Error run() override;
public: public:
CryOmni3DEngine(OSystem *syst, const CryOmni3DGameDescription *gamedesc); CryOmni3DEngine(OSystem *syst, const CryOmni3DGameDescription *gamedesc);
virtual ~CryOmni3DEngine(); ~CryOmni3DEngine() override;
// Detection related functions // Detection related functions
const CryOmni3DGameDescription *_gameDescription; const CryOmni3DGameDescription *_gameDescription;

14
engines/cryomni3d/detection.cpp
View File

@ -99,19 +99,19 @@ public:
return "cryomni3d"; return "cryomni3d";
} }
virtual const char *getName() const override { const char *getName() const override {
return "Cryo Omni3D"; return "Cryo Omni3D";
} }
virtual const char *getOriginalCopyright() const override { const char *getOriginalCopyright() const override {
return "Cryo game Engine (C) 1997-2002 Cryo Interactive"; return "Cryo game Engine (C) 1997-2002 Cryo Interactive";
} }
virtual bool hasFeature(MetaEngineFeature f) const override; bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual SaveStateList listSaves(const char *target) const override; SaveStateList listSaves(const char *target) const override;
virtual int getMaximumSaveSlot() const override { return 999; } int getMaximumSaveSlot() const override { return 999; }
virtual void removeSaveState(const char *target, int slot) const override; void removeSaveState(const char *target, int slot) const override;
}; };
bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const { bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const {

6
engines/cryomni3d/image/codecs/hlz.h
View File

@ -35,10 +35,10 @@ namespace Image {
class HLZDecoder : public Codec { class HLZDecoder : public Codec {
public: public:
HLZDecoder(int width, int height); HLZDecoder(int width, int height);
~HLZDecoder(); ~HLZDecoder() override;
const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream); const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream) override;
Graphics::PixelFormat getPixelFormat() const; Graphics::PixelFormat getPixelFormat() const override;
static void decodeFrameInPlace(Common::SeekableReadStream &stream, uint32 size, byte *dst); static void decodeFrameInPlace(Common::SeekableReadStream &stream, uint32 size, byte *dst);

12
engines/cryomni3d/image/hlz.h
View File

@ -41,14 +41,14 @@ class HLZDecoder;
class HLZFileDecoder : public ImageDecoder { class HLZFileDecoder : public ImageDecoder {
public: public:
HLZFileDecoder(); HLZFileDecoder();
virtual ~HLZFileDecoder(); ~HLZFileDecoder() override;
// ImageDecoder API // ImageDecoder API
void destroy(); void destroy() override;
virtual bool loadStream(Common::SeekableReadStream &stream); bool loadStream(Common::SeekableReadStream &stream) override;
virtual const Graphics::Surface *getSurface() const { return _surface; } const Graphics::Surface *getSurface() const override { return _surface; }
const byte *getPalette() const { return _palette; } const byte *getPalette() const override { return _palette; }
uint16 getPaletteColorCount() const { return 256; } uint16 getPaletteColorCount() const override { return 256; }
private: private:
HLZDecoder *_codec; HLZDecoder *_codec;

20
engines/cryomni3d/sprites.h
View File

@ -65,17 +65,17 @@ public:
private: private:
class CryoCursor : public Graphics::Cursor { class CryoCursor : public Graphics::Cursor {
public: public:
virtual uint16 getWidth() const override { return _width; } uint16 getWidth() const override { return _width; }
virtual uint16 getHeight() const override { return _height; } uint16 getHeight() const override { return _height; }
virtual uint16 getHotspotX() const override { return _offX; } uint16 getHotspotX() const override { return _offX; }
virtual uint16 getHotspotY() const override { return _offY; } uint16 getHotspotY() const override { return _offY; }
virtual byte getKeyColor() const override { return 0; } 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; } const byte *getPalette() const override { return nullptr; }
virtual byte getPaletteStartIndex() const override { return 0; } byte getPaletteStartIndex() const override { return 0; }
virtual uint16 getPaletteCount() const override { return 0; } uint16 getPaletteCount() const override { return 0; }
uint setup(uint16 width, uint16 height); uint setup(uint16 width, uint16 height);
@ -90,7 +90,7 @@ private:
uint refCnt; uint refCnt;
CryoCursor(); CryoCursor();
virtual ~CryoCursor(); ~CryoCursor() override;
}; };
// Pointer to avoid to mutate Sprites when asking for a cursor // Pointer to avoid to mutate Sprites when asking for a cursor

20
engines/cryomni3d/versailles/engine.h
View File

@ -226,29 +226,29 @@ protected:
public: public:
CryOmni3DEngine_Versailles(OSystem *syst, const CryOmni3DGameDescription *gamedesc); 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; bool hasFeature(EngineFeature f) const override;
virtual Common::Error loadGameState(int slot) override; Common::Error loadGameState(int slot) override;
virtual Common::Error saveGameState(int slot, const Common::String &desc) override; Common::Error saveGameState(int slot, const Common::String &desc) override;
Common::String prepareFileName(const Common::String &baseName, const char *extension) const { Common::String prepareFileName(const Common::String &baseName, const char *extension) const {
const char *const extensions[] = { extension, nullptr }; const char *const extensions[] = { extension, nullptr };
return prepareFileName(baseName, extensions); 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; const char *const *extensions) const override;
void setupPalette(const byte *colors, uint start, uint num) override { setupPalette(colors, start, num, true); } 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; void makeTranslucent(Graphics::Surface &dst, const Graphics::Surface &src) const override;
virtual bool displayToolbar(const Graphics::Surface *original) override { return _toolbar.displayToolbar(original); }; bool displayToolbar(const Graphics::Surface *original) override { return _toolbar.displayToolbar(original); };
virtual bool hasPlaceDocumentation() override; bool hasPlaceDocumentation() override;
virtual bool displayPlaceDocumentation() override; bool displayPlaceDocumentation() override;
virtual uint displayOptions() override; uint displayOptions() override;
virtual bool shouldAbort() override; bool shouldAbort() override;
private: private:
void setupFonts(); void setupFonts();

34
engines/cryomni3d/video/hnm_decoder.h
View File

@ -44,10 +44,10 @@ namespace Video {
class HNMDecoder : public VideoDecoder { class HNMDecoder : public VideoDecoder {
public: public:
HNMDecoder(bool loop = false, byte *initialPalette = nullptr); HNMDecoder(bool loop = false, byte *initialPalette = nullptr);
virtual ~HNMDecoder(); ~HNMDecoder() override;
bool loadStream(Common::SeekableReadStream *stream); bool loadStream(Common::SeekableReadStream *stream) override;
void readNextPacket(); void readNextPacket() override;
void close(); void close() override;
void setRegularFrameDelay(uint32 regularFrameDelay) { _regularFrameDelay = regularFrameDelay; } void setRegularFrameDelay(uint32 regularFrameDelay) { _regularFrameDelay = regularFrameDelay; }
@ -56,19 +56,19 @@ private:
public: public:
HNM4VideoTrack(uint32 width, uint32 height, uint32 frameSize, uint32 frameCount, HNM4VideoTrack(uint32 width, uint32 height, uint32 frameSize, uint32 frameCount,
uint32 regularFrameDelay, const byte *initialPalette = nullptr); uint32 regularFrameDelay, const byte *initialPalette = nullptr);
~HNM4VideoTrack(); ~HNM4VideoTrack() override;
// When _frameCount is 0, it means we are looping // When _frameCount is 0, it means we are looping
bool endOfTrack() const { return (_frameCount == 0) ? false : VideoTrack::endOfTrack(); } bool endOfTrack() const override { return (_frameCount == 0) ? false : VideoTrack::endOfTrack(); }
uint16 getWidth() const { return _surface.w; } uint16 getWidth() const override { return _surface.w; }
uint16 getHeight() const { return _surface.h; } uint16 getHeight() const override { return _surface.h; }
Graphics::PixelFormat getPixelFormat() const { return _surface.format; } Graphics::PixelFormat getPixelFormat() const override { return _surface.format; }
int getCurFrame() const { return _curFrame; } int getCurFrame() const override { return _curFrame; }
int getFrameCount() const { return _frameCount; } int getFrameCount() const override { return _frameCount; }
uint32 getNextFrameStartTime() const { return _nextFrameStartTime; } uint32 getNextFrameStartTime() const override { return _nextFrameStartTime; }
const Graphics::Surface *decodeNextFrame() { return &_surface; } const Graphics::Surface *decodeNextFrame() override { return &_surface; }
const byte *getPalette() const { _dirtyPalette = false; return _palette; } const byte *getPalette() const override { _dirtyPalette = false; return _palette; }
bool hasDirtyPalette() const { return _dirtyPalette; } bool hasDirtyPalette() const override { return _dirtyPalette; }
/** Decode a video chunk. */ /** Decode a video chunk. */
void decodePalette(Common::SeekableReadStream *stream, uint32 size); void decodePalette(Common::SeekableReadStream *stream, uint32 size);
@ -100,11 +100,11 @@ private:
public: public:
DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate, DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate,
Audio::Mixer::SoundType soundType); Audio::Mixer::SoundType soundType);
~DPCMAudioTrack(); ~DPCMAudioTrack() override;
Audio::Timestamp decodeSound(Common::SeekableReadStream *stream, uint32 size); Audio::Timestamp decodeSound(Common::SeekableReadStream *stream, uint32 size);
protected: protected:
Audio::AudioStream *getAudioStream() const { return _audioStream; } Audio::AudioStream *getAudioStream() const override { return _audioStream; }
private: private:
Audio::QueuingAudioStream *_audioStream; Audio::QueuingAudioStream *_audioStream;
bool _gotLUT; bool _gotLUT;