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

CGE: Add override keywords

Browse Source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:27 +01:00
parent 79efd3c46e
commit dd6e745487
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/cge/cge.h
View File

@ -136,12 +136,12 @@ private:
Common::String generateSaveName(int slot);
public:
CGEEngine(OSystem *syst, const ADGameDescription *gameDescription);
~CGEEngine();
virtual bool hasFeature(EngineFeature f) const override;
virtual bool canLoadGameStateCurrently() override;
virtual bool canSaveGameStateCurrently() override;
virtual Common::Error loadGameState(int slot) override;
virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
~CGEEngine() override;
bool hasFeature(EngineFeature f) const override;
bool canLoadGameStateCurrently() override;
bool canSaveGameStateCurrently() override;
Common::Error loadGameState(int slot) override;
Common::Error saveGameState(int slot, const Common::String &desc) override;
static const int _maxSceneArr[5];
bool _quitFlag;
@ -205,7 +205,7 @@ public:
BitmapPtr *_miniShpList;
int _startGameSlot;
virtual Common::Error run() override;
Common::Error run() override;
GUI::Debugger *getDebugger() override {
return _console;
}
@ -335,7 +335,7 @@ private:
class Console : public GUI::Debugger {
public:
Console(CGEEngine *vm) {}
virtual ~Console() {}
~Console() override {}
};
} // End of namespace CGE

6
engines/cge/cge_main.h
View File

@ -92,8 +92,8 @@ public:
void setPal();
void funTouch();
virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode);
void tick();
void touch(uint16 mask, int x, int y, Common::KeyCode keyCode) override;
void tick() override;
private:
CGEEngine *_vm;
};
@ -101,7 +101,7 @@ private:
class Square : public Sprite {
public:
Square(CGEEngine *vm);
virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode);
void touch(uint16 mask, int x, int y, Common::KeyCode keyCode) override;
private:
CGEEngine *_vm;
};

2
engines/cge/console.h
View File

@ -32,7 +32,7 @@ class CGEEngine;
class CGEConsole : public GUI::Debugger {
public:
CGEConsole(CGEEngine *vm);
virtual ~CGEConsole();
~CGEConsole() override;
private:
CGEEngine *_vm;

14
engines/cge/detection.cpp
View File

@ -121,21 +121,21 @@ public:
return "cge";
}
virtual const char *getName() const override {
const char *getName() const override {
return "CGE";
}
virtual const char *getOriginalCopyright() const override {
const char *getOriginalCopyright() const override {
return "Soltys (C) 1994-1996 L.K. Avalon";
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual int getMaximumSaveSlot() const override;
virtual SaveStateList listSaves(const char *target) const override;
bool hasFeature(MetaEngineFeature f) const override;
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
int getMaximumSaveSlot() const override;
SaveStateList listSaves(const char *target) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
virtual void removeSaveState(const char *target, int slot) const override;
void removeSaveState(const char *target, int slot) const override;
};
static ADGameDescription s_fallbackDesc = {

2
engines/cge/events.h
View File

@ -84,7 +84,7 @@ public:
int _buttons;
Sprite *_busy;
Mouse(CGEEngine *vm);
~Mouse();
~Mouse() override;
void on();
void off();
void newMouse(Common::Event &event);

2
engines/cge/game.h
View File

@ -45,7 +45,7 @@ private:
public:
int _tx, _ty;
Fly(CGEEngine *vm, Bitmap **shpl);
void tick();
void tick() override;
};
} // End of namespace CGE

6
engines/cge/sound.h
View File

@ -120,13 +120,13 @@ private:
void sndMidiStop();
public:
MusicPlayer(CGEEngine *vm);
~MusicPlayer();
~MusicPlayer() override;
void loadMidi(int ref);
void killMidi();
virtual void send(uint32 b);
virtual void sendToChannel(byte channel, uint32 b);
void send(uint32 b) override;
void sendToChannel(byte channel, uint32 b) override;
};
} // End of namespace CGE

2
engines/cge/talk.h
View File

@ -66,7 +66,7 @@ class InfoLine : public Talk {
const char *_oldText;
public:
InfoLine(CGEEngine *vm, uint16 wid);
void update(const char *text);
void update(const char *text) override;
private:
CGEEngine *_vm;
};

4
engines/cge/vmenu.h
View File

@ -57,8 +57,8 @@ public:
static int _recent;
MenuBar *_bar;
Vmenu(CGEEngine *vm, Choice *list, int x, int y);
~Vmenu();
virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode);
~Vmenu() override;
void touch(uint16 mask, int x, int y, Common::KeyCode keyCode) override;
private:
char *_vmgt;
CGEEngine *_vm;

4
engines/cge/walk.h
View File

@ -67,8 +67,8 @@ public:
Dir _dir;
Walk(CGEEngine *vm, BitmapPtr *shpl);
~Walk();
void tick();
~Walk() override;
void tick() override;
void findWay(Cluster c);
void findWay(Sprite *spr);
int distance(Sprite *spr);