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

ACCESS: Add override keywords

Browse Source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:26 +01:00
parent bf3a8df741
commit 9173dc8a03
17 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/access/access.h
View File

@ -123,8 +123,8 @@ protected:
void playVideo(int videoNum, const Common::Point &pt);
// Engine APIs
virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
protected:
/**
* Play the game
@ -239,7 +239,7 @@ public:
public:
AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc);
virtual ~AccessEngine();
~AccessEngine() override;
virtual void dead(int deathId) = 0;
@ -286,12 +286,12 @@ 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;
/**
* Returns true if a savegame can currently be loaded

10
engines/access/amazon/amazon_game.h
View File

@ -59,12 +59,12 @@ protected:
/**
* Play the game
*/
virtual void playGame();
void playGame() override;
/**
* Synchronize savegame data
*/
virtual void synchronize(Common::Serializer &s);
void synchronize(Common::Serializer &s) override;
public:
InactivePlayer _inactive;
bool _charSegSwitch;
@ -109,9 +109,9 @@ public:
public:
AmazonEngine(OSystem *syst, const AccessGameDescription *gameDesc);
virtual ~AmazonEngine();
~AmazonEngine() override;
virtual void dead(int deathId);
void dead(int deathId) override;
/**
* Free the inactive player data
@ -120,7 +120,7 @@ public:
void drawHelp(const Common::String str);
virtual void establish(int esatabIndex, int sub);
void establish(int esatabIndex, int sub) override;
void tileScreen();
void updateSummary(int chap);

2
engines/access/amazon/amazon_player.h
View File

@ -38,7 +38,7 @@ private:
public:
AmazonPlayer(AccessEngine *vm);
virtual void load();
void load() override;
};
} // End of namespace Amazon

4
engines/access/amazon/amazon_resources.h
View File

@ -127,7 +127,7 @@ protected:
/**
* Load data from the access.dat file
*/
virtual void load(Common::SeekableReadStream &s);
void load(Common::SeekableReadStream &s) override;
public:
AmazonFont *_font3x5, *_font6x6;
Common::String NO_HELP_MESSAGE;
@ -139,7 +139,7 @@ public:
Common::String IQLABELS[9];
public:
AmazonResources(AccessEngine *vm) : Resources(vm), _font3x5(nullptr), _font6x6(nullptr) {}
virtual ~AmazonResources();
~AmazonResources() override;
};
#define AMRES (*((Amazon::AmazonResources *)_vm->_res))

20
engines/access/amazon/amazon_room.h
View File

@ -42,27 +42,27 @@ private:
void roomSet();
protected:
virtual void loadRoom(int roomNumber);
void loadRoom(int roomNumber) override;
virtual void reloadRoom();
void reloadRoom() override;
virtual void reloadRoom1();
void reloadRoom1() override;
virtual void setupRoom();
void setupRoom() override;
virtual void mainAreaClick();
void mainAreaClick() override;
virtual void clearRoom();
void clearRoom() override;
virtual void walkCursor();
void walkCursor() override;
public:
AmazonRoom(AccessEngine *vm);
virtual ~AmazonRoom();
~AmazonRoom() override;
virtual void init4Quads();
void init4Quads() override;
virtual void roomMenu();
void roomMenu() override;
};
} // End of namespace Amazon

4
engines/access/amazon/amazon_scripts.h
View File

@ -36,8 +36,8 @@ class AmazonScripts : public Scripts {
private:
AmazonEngine *_game;
protected:
virtual void executeSpecial(int commandIndex, int param1, int param2);
virtual void executeCommand(int commandIndex);
void executeSpecial(int commandIndex, int param1, int param2) override;
void executeCommand(int commandIndex) override;
void cLoop();
void mWhile1();

6
engines/access/asurface.h
View File

@ -64,7 +64,7 @@ public:
public:
BaseSurface();
virtual ~BaseSurface();
~BaseSurface() override;
void clearBuffer();
@ -125,7 +125,7 @@ protected:
* Override the addDirtyRect from Graphics::Screen, since for standard
* surfaces we don't need dirty rects to be tracked
*/
virtual void addDirtyRect(const Common::Rect &r) {}
void addDirtyRect(const Common::Rect &r) override {}
public:
ASurface() : BaseSurface() {}
};
@ -133,7 +133,7 @@ public:
class SpriteFrame : public ASurface {
public:
SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, int frameSize);
~SpriteFrame();
~SpriteFrame() override;
};
class SpriteResource {

6
engines/access/debugger.h
View File

@ -42,10 +42,10 @@ protected:
bool Cmd_PlayMovie(int argc, const char **argv);
public:
static Debugger *init(AccessEngine *vm);
void postEnter();
void postEnter() override;
public:
Debugger(AccessEngine *vm);
virtual ~Debugger();
~Debugger() override;
};
namespace Amazon {
@ -55,7 +55,7 @@ protected:
bool Cmd_StartChapter(int argc, const char **argv);
public:
AmazonDebugger(AccessEngine *vm);
virtual ~AmazonDebugger() {}
~AmazonDebugger() override {}
};
} // End of namespace Amazon

16
engines/access/detection.cpp
View File

@ -88,23 +88,23 @@ public:
_maxScanDepth = 3;
}
virtual const char *getEngineId() const override {
const char *getEngineId() const override {
return "access";
}
virtual const char *getName() const override {
const char *getName() const override {
return "Access";
}
virtual const char *getOriginalCopyright() const override {
const char *getOriginalCopyright() const override {
return "Access Engine (C) 1989-1994 Access Software";
}
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;
};

8
engines/access/martian/martian_game.h
View File

@ -53,9 +53,9 @@ protected:
/**
* Play the game
*/
virtual void playGame();
void playGame() override;
virtual void dead(int deathId);
void dead(int deathId) override;
void setNoteParams();
void displayNote(const Common::String &msg);
@ -63,11 +63,11 @@ public:
SpriteResource *_spec7Objects;
MartianEngine(OSystem *syst, const AccessGameDescription *gameDesc);
virtual ~MartianEngine();
~MartianEngine() override;
void doSpecial5(int param1);
void showDeathText(Common::String msg);
virtual void establish(int esatabIndex, int sub) {};
void establish(int esatabIndex, int sub) override {};
};
} // End of namespace Martian

2
engines/access/martian/martian_player.h
View File

@ -37,7 +37,7 @@ private:
MartianEngine *_game;
public:
MartianPlayer(AccessEngine *vm);
virtual void load();
void load() override;
};
} // End of namespace Martian

4
engines/access/martian/martian_resources.h
View File

@ -60,13 +60,13 @@ protected:
/**
* Load data from the access.dat file
*/
virtual void load(Common::SeekableReadStream &s);
void load(Common::SeekableReadStream &s) override;
public:
MartianFont *_font6x6;
MartianFont *_font3x5;
public:
MartianResources(AccessEngine *vm) : Resources(vm), _font6x6(nullptr), _font3x5(nullptr) {}
virtual ~MartianResources();
~MartianResources() override;
};
#define MMRES (*((Martian::MartianResources *)_vm->_res))

14
engines/access/martian/martian_room.h
View File

@ -43,21 +43,21 @@ private:
int _byte26CD2[30];
int _byte26CBC[10];
protected:
virtual void loadRoom(int roomNumber);
void loadRoom(int roomNumber) override;
virtual void reloadRoom();
void reloadRoom() override;
virtual void reloadRoom1();
void reloadRoom1() override;
virtual void mainAreaClick();
void mainAreaClick() override;
public:
MartianRoom(AccessEngine *vm);
virtual ~MartianRoom();
~MartianRoom() override;
virtual void init4Quads() { }
void init4Quads() override { }
virtual void roomMenu();
void roomMenu() override;
};
} // End of namespace Martian

4
engines/access/martian/martian_scripts.h
View File

@ -44,8 +44,8 @@ private:
void cmdSpecial7();
protected:
virtual void executeSpecial(int commandIndex, int param1, int param2);
virtual void executeCommand(int commandIndex);
void executeSpecial(int commandIndex, int param1, int param2) override;
void executeCommand(int commandIndex) override;
public:
MartianScripts(AccessEngine *vm);

14
engines/access/screen.h
View File

@ -84,21 +84,21 @@ public:
/**
* Updates the screen
*/
virtual void update();
void update() override;
virtual void copyBlock(BaseSurface *src, const Common::Rect &bounds);
void copyBlock(BaseSurface *src, const Common::Rect &bounds) override;
virtual void restoreBlock();
void restoreBlock() override;
virtual void drawRect();
void drawRect() override;
virtual void drawBox();
void drawBox() override;
virtual void copyBuffer(Graphics::ManagedSurface *src);
void copyBuffer(Graphics::ManagedSurface *src) override;
public:
Screen(AccessEngine *vm);
virtual ~Screen() {}
~Screen() override {}
void setDisplayScan();

4
engines/access/sound.h
View File

@ -92,7 +92,7 @@ private:
Resource *_tempMusic;
// MidiDriver_BASE interface implementation
virtual void send(uint32 b);
void send(uint32 b) override;
public:
Resource *_music;
@ -100,7 +100,7 @@ public:
public:
MusicManager(AccessEngine *vm);
~MusicManager();
~MusicManager() override;
void midiPlay();

32
engines/access/video/movie_decoder.h
View File

@ -54,13 +54,13 @@ enum kDebugLevels {
class AccessVIDMovieDecoder : public Video::VideoDecoder {
public:
AccessVIDMovieDecoder();
~AccessVIDMovieDecoder();
~AccessVIDMovieDecoder() override;
bool loadStream(Common::SeekableReadStream *stream);
void close();
bool loadStream(Common::SeekableReadStream *stream) override;
void close() override;
protected:
void readNextPacket();
void readNextPacket() override;
private:
bool streamSkipFullFrameCompressedFill();
@ -81,20 +81,20 @@ private:
class StreamVideoTrack : public VideoTrack {
public:
StreamVideoTrack(uint32 width, uint32 height, uint16 regularFrameDelay);
~StreamVideoTrack();
~StreamVideoTrack() override;
bool endOfTrack() const;
bool endOfTrack() const override;
uint16 getWidth() const { return _width; }
uint16 getHeight() const { return _height; }
Graphics::PixelFormat getPixelFormat() const;
int getCurFrame() const { return _curFrame; }
uint16 getWidth() const override { return _width; }
uint16 getHeight() const override { return _height; }
Graphics::PixelFormat getPixelFormat() const override;
int getCurFrame() const override { return _curFrame; }
void setNextFrameStartTime(uint32 nextFrameStartTime) { _nextFrameStartTime = nextFrameStartTime; }
uint32 getNextFrameStartTime() const { return _nextFrameStartTime; }
const Graphics::Surface *decodeNextFrame() { return _surface; }
uint32 getNextFrameStartTime() const override { return _nextFrameStartTime; }
const Graphics::Surface *decodeNextFrame() override { return _surface; }
const byte *getPalette() const;
bool hasDirtyPalette() const;
const byte *getPalette() const override;
bool hasDirtyPalette() const override;
void decodePalette(Common::SeekableReadStream *stream);
void decodeFrame(Common::SeekableReadStream *stream, byte chunkId);
@ -120,13 +120,13 @@ private:
class StreamAudioTrack : public AudioTrack {
public:
StreamAudioTrack(uint32 sampleRate, Audio::Mixer::SoundType soundType);
~StreamAudioTrack();
~StreamAudioTrack() override;
void queueAudio(Common::SeekableReadStream *stream, byte chunkId);
bool skipOverAudio(Common::SeekableReadStream *stream, byte chunkId);
protected:
Audio::AudioStream *getAudioStream() const;
Audio::AudioStream *getAudioStream() const override;
private:
Audio::QueuingAudioStream *_audioStream;