[Scummvm-git-logs] scummvm master -> b0affe5bf2c7240afb8f16c9b9476a049941439f
sev-
sev at scummvm.org
Wed Mar 28 12:49:45 CEST 2018
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d6b5e3f611 BAKCENDS: Mark methods as override
511457818d SCUMM: Mark methods as override
5c77858aee FULLPIPE: Remove unneeded variable
84f22f2891 KYRA: Add method override statements
067d4779fa MACVENTURE: Fix meta engine class definition
283f7485e3 GUI: Added override clauses
f54e528677 MOHAWK: Added override clauses
378d9153b6 PEGASUS: Add override specifier
22b674777f SCI: Added overried specifiers
ea7f92bb21 XEEN: Added override specifier
b0affe5bf2 GUI: Added override specifiers
Commit: d6b5e3f611c315b2d5dca01f58c92a8b53ebc32b
https://github.com/scummvm/scummvm/commit/d6b5e3f611c315b2d5dca01f58c92a8b53ebc32b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T11:58:35+02:00
Commit Message:
BAKCENDS: Mark methods as override
Changed paths:
backends/events/default/default-events.h
backends/graphics/windowed.h
backends/modular-backend.h
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index df6ebd2..9a85fca 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -49,7 +49,7 @@ class DefaultEventManager : public Common::EventManager, Common::EventObserver {
Common::ArtificialEventSource _artificialEventSource;
Common::Queue<Common::Event> _eventQueue;
- bool notifyEvent(const Common::Event &ev) {
+ bool notifyEvent(const Common::Event &ev) override {
_eventQueue.push(ev);
return true;
}
@@ -76,17 +76,17 @@ public:
DefaultEventManager(Common::EventSource *boss);
~DefaultEventManager();
- virtual void init();
- virtual bool pollEvent(Common::Event &event);
- virtual void pushEvent(const Common::Event &event);
+ virtual void init() override;
+ virtual bool pollEvent(Common::Event &event) override;
+ virtual void pushEvent(const Common::Event &event) override;
virtual void purgeMouseEvents() override;
- virtual Common::Point getMousePos() const { return _mousePos; }
- virtual int getButtonState() const { return _buttonState; }
- virtual int getModifierState() const { return _modifierState; }
- virtual int shouldQuit() const { return _shouldQuit; }
- virtual int shouldRTL() const { return _shouldRTL; }
- virtual void resetRTL() { _shouldRTL = false; }
+ virtual Common::Point getMousePos() const override { return _mousePos; }
+ virtual int getButtonState() const override { return _buttonState; }
+ virtual int getModifierState() const override { return _modifierState; }
+ virtual int shouldQuit() const override { return _shouldQuit; }
+ virtual int shouldRTL() const override { return _shouldRTL; }
+ virtual void resetRTL() override { _shouldRTL = false; }
#ifdef FORCE_RTL
virtual void resetQuit() { _shouldQuit = false; }
#endif
diff --git a/backends/graphics/windowed.h b/backends/graphics/windowed.h
index 5f89d2d..8a0bddf 100644
--- a/backends/graphics/windowed.h
+++ b/backends/graphics/windowed.h
@@ -201,7 +201,7 @@ protected:
* @param x The new X position of the mouse in virtual screen coordinates.
* @param y The new Y position of the mouse in virtual screen coordinates.
*/
- void warpMouse(const int x, const int y) {
+ void warpMouse(const int x, const int y) override {
// Check active coordinate instead of window coordinate to avoid warping
// the mouse if it is still within the same virtual pixel
const Common::Point virtualCursor = convertWindowToVirtual(_cursorX, _cursorY);
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index 982dbbf..fa34f29 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -52,9 +52,9 @@ public:
/** @name Features */
//@{
- virtual bool hasFeature(Feature f);
- virtual void setFeatureState(Feature f, bool enable);
- virtual bool getFeatureState(Feature f);
+ virtual bool hasFeature(Feature f) override;
+ virtual void setFeatureState(Feature f, bool enable) override;
+ virtual bool getFeatureState(Feature f) override;
//@}
@@ -62,76 +62,76 @@ public:
//@{
virtual GraphicsManager *getGraphicsManager();
- virtual const GraphicsMode *getSupportedGraphicsModes() const;
- virtual int getDefaultGraphicsMode() const;
- virtual bool setGraphicsMode(int mode);
- virtual int getGraphicsMode() const;
- virtual const GraphicsMode *getSupportedShaders() const;
- virtual int getShader() const;
- virtual bool setShader(int id);
- virtual void resetGraphicsScale();
+ virtual const GraphicsMode *getSupportedGraphicsModes() const override;
+ virtual int getDefaultGraphicsMode() const override;
+ virtual bool setGraphicsMode(int mode) override;
+ virtual int getGraphicsMode() const override;
+ virtual const GraphicsMode *getSupportedShaders() const override;
+ virtual int getShader() const override;
+ virtual bool setShader(int id) override;
+ virtual void resetGraphicsScale() override;
#ifdef USE_RGB_COLOR
- virtual Graphics::PixelFormat getScreenFormat() const;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
+ virtual Graphics::PixelFormat getScreenFormat() const override;
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;
#endif
- virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL);
+ virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL) override;
virtual void initSizeHint(const Graphics::ModeList &modes) override;
- virtual int getScreenChangeID() const;
-
- virtual void beginGFXTransaction();
- virtual OSystem::TransactionError endGFXTransaction();
-
- virtual int16 getHeight();
- virtual int16 getWidth();
- virtual PaletteManager *getPaletteManager();
- virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h);
- virtual Graphics::Surface *lockScreen();
- virtual void unlockScreen();
- virtual void fillScreen(uint32 col);
- virtual void updateScreen();
- virtual void setShakePos(int shakeOffset);
- virtual void setFocusRectangle(const Common::Rect& rect);
- virtual void clearFocusRectangle();
-
- virtual void showOverlay();
- virtual void hideOverlay();
- virtual Graphics::PixelFormat getOverlayFormat() const;
- virtual void clearOverlay();
- virtual void grabOverlay(void *buf, int pitch);
- virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h);
- virtual int16 getOverlayHeight();
- virtual int16 getOverlayWidth();
-
- virtual bool showMouse(bool visible);
- virtual void warpMouse(int x, int y);
- virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL);
- virtual void setCursorPalette(const byte *colors, uint start, uint num);
+ virtual int getScreenChangeID() const override;
+
+ virtual void beginGFXTransaction() override;
+ virtual OSystem::TransactionError endGFXTransaction() override;
+
+ virtual int16 getHeight() override;
+ virtual int16 getWidth() override;
+ virtual PaletteManager *getPaletteManager() override;
+ virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override;
+ virtual Graphics::Surface *lockScreen() override;
+ virtual void unlockScreen() override;
+ virtual void fillScreen(uint32 col) override;
+ virtual void updateScreen() override;
+ virtual void setShakePos(int shakeOffset) override;
+ virtual void setFocusRectangle(const Common::Rect& rect) override;
+ virtual void clearFocusRectangle() override;
+
+ virtual void showOverlay() override;
+ virtual void hideOverlay() override;
+ virtual Graphics::PixelFormat getOverlayFormat() const override;
+ virtual void clearOverlay() override;
+ virtual void grabOverlay(void *buf, int pitch) override;
+ virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override;
+ virtual int16 getOverlayHeight() override;
+ virtual int16 getOverlayWidth() override;
+
+ virtual bool showMouse(bool visible) override;
+ virtual void warpMouse(int x, int y) override;
+ virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override;
+ virtual void setCursorPalette(const byte *colors, uint start, uint num) override;
//@}
/** @name Mutex handling */
//@{
- virtual MutexRef createMutex();
- virtual void lockMutex(MutexRef mutex);
- virtual void unlockMutex(MutexRef mutex);
- virtual void deleteMutex(MutexRef mutex);
+ virtual MutexRef createMutex() override;
+ virtual void lockMutex(MutexRef mutex) override;
+ virtual void unlockMutex(MutexRef mutex) override;
+ virtual void deleteMutex(MutexRef mutex) override;
//@}
/** @name Sound */
//@{
- virtual Audio::Mixer *getMixer();
+ virtual Audio::Mixer *getMixer() override;
//@}
/** @name Miscellaneous */
//@{
- virtual void quit();
- virtual void displayMessageOnOSD(const char *msg);
- virtual void displayActivityIconOnOSD(const Graphics::Surface *icon);
+ virtual void quit() override;
+ virtual void displayMessageOnOSD(const char *msg) override;
+ virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;
//@}
Commit: 511457818d95affaf18f09215ae31a6c7a25a786
https://github.com/scummvm/scummvm/commit/511457818d95affaf18f09215ae31a6c7a25a786
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:01:38+02:00
Commit Message:
SCUMM: Mark methods as override
Changed paths:
engines/scumm/dialogs.h
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 9dee4c8..b2cd760 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -127,15 +127,15 @@ class ValueDisplayDialog : public GUI::Dialog {
public:
ValueDisplayDialog(const Common::String& label, int minVal, int maxVal, int val, uint16 incKey, uint16 decKey);
- virtual void open();
+ virtual void open() override;
void drawDialog(GUI::DrawLayer layerToDraw) override;
- virtual void handleTickle();
- virtual void handleMouseDown(int x, int y, int button, int clickCount) {
+ virtual void handleTickle() override;
+ virtual void handleMouseDown(int x, int y, int button, int clickCount) override {
close();
}
- virtual void handleKeyDown(Common::KeyState state);
+ virtual void handleKeyDown(Common::KeyState state) override;
- virtual void reflowLayout();
+ virtual void reflowLayout() override;
protected:
enum {
Commit: 5c77858aee51bcc677c15b68510a2944237a89b3
https://github.com/scummvm/scummvm/commit/5c77858aee51bcc677c15b68510a2944237a89b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:07:10+02:00
Commit Message:
FULLPIPE: Remove unneeded variable
Changed paths:
engines/fullpipe/interaction.h
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index 9ffcdcc..7ea58e6 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -70,11 +70,10 @@ public:
private:
InteractionList _interactions;
- int16 _field_20;
static bool compareInteractions(const Interaction *i1, const Interaction *i2);
public:
- InteractionController() : _field_20(0), _flag24(true) {}
+ InteractionController() : _flag24(true) {}
virtual ~InteractionController();
virtual bool load(MfcArchive &file);
Commit: 84f22f2891514024a92aeb836218b47f9fdbbc86
https://github.com/scummvm/scummvm/commit/84f22f2891514024a92aeb836218b47f9fdbbc86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:13:05+02:00
Commit Message:
KYRA: Add method override statements
Changed paths:
engines/kyra/sound_intern.h
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h
index 4b77bf1..3559133 100644
--- a/engines/kyra/sound_intern.h
+++ b/engines/kyra/sound_intern.h
@@ -169,24 +169,24 @@ public:
SoundPC98(KyraEngine_v1 *vm, Audio::Mixer *mixer);
virtual ~SoundPC98();
- virtual kType getMusicType() const { return kPC98; }
+ virtual kType getMusicType() const override { return kPC98; }
- virtual bool init();
+ virtual bool init() override;
- virtual void initAudioResourceInfo(int set, void *info);
- virtual void selectAudioResourceSet(int set);
- virtual bool hasSoundFile(uint file) const;
- virtual void loadSoundFile(uint file);
- virtual void loadSoundFile(Common::String file);
+ virtual void initAudioResourceInfo(int set, void *info) override;
+ virtual void selectAudioResourceSet(int set) override;
+ virtual bool hasSoundFile(uint file) const override;
+ virtual void loadSoundFile(uint file) override;
+ virtual void loadSoundFile(Common::String file) override;
- virtual void playTrack(uint8 track);
- virtual void haltTrack();
- virtual void beginFadeOut();
+ virtual void playTrack(uint8 track) override;
+ virtual void haltTrack() override;
+ virtual void beginFadeOut() override;
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) override { return -1; }
- virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
+ virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF) override;
- virtual void updateVolumeSettings();
+ virtual void updateVolumeSettings() override;
private:
int _lastTrack;
@@ -204,25 +204,25 @@ public:
SoundTownsPC98_v2(KyraEngine_v1 *vm, Audio::Mixer *mixer);
virtual ~SoundTownsPC98_v2();
- virtual kType getMusicType() const { return _vm->gameFlags().platform == Common::kPlatformFMTowns ? kTowns : kPC98; }
+ virtual kType getMusicType() const override { return _vm->gameFlags().platform == Common::kPlatformFMTowns ? kTowns : kPC98; }
- virtual bool init();
- virtual void process();
+ virtual bool init() override;
+ virtual void process() override;
- virtual void initAudioResourceInfo(int set, void *info);
- virtual void selectAudioResourceSet(int set);
- virtual bool hasSoundFile(uint file) const;
- virtual void loadSoundFile(uint file) {}
- virtual void loadSoundFile(Common::String file);
+ virtual void initAudioResourceInfo(int set, void *info) override;
+ virtual void selectAudioResourceSet(int set) override;
+ virtual bool hasSoundFile(uint file) const override;
+ virtual void loadSoundFile(uint file) override {}
+ virtual void loadSoundFile(Common::String file) override;
- virtual void playTrack(uint8 track);
- virtual void haltTrack();
- virtual void beginFadeOut();
+ virtual void playTrack(uint8 track) override;
+ virtual void haltTrack() override;
+ virtual void beginFadeOut() override;
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume = 255, uint8 priority = 255, bool isSfx = true) override;
- virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
+ virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF) override;
- virtual void updateVolumeSettings();
+ virtual void updateVolumeSettings() override;
private:
Audio::AudioStream *_currentSFX;
@@ -320,22 +320,22 @@ public:
SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer);
virtual ~SoundAmiga();
- virtual kType getMusicType() const { return kAmiga; } //FIXME
+ virtual kType getMusicType() const override { return kAmiga; } //FIXME
- virtual bool init();
+ virtual bool init() override;
- virtual void initAudioResourceInfo(int set, void *info);
- virtual void selectAudioResourceSet(int set);
- virtual bool hasSoundFile(uint file) const;
- virtual void loadSoundFile(uint file);
- virtual void loadSoundFile(Common::String) {}
+ virtual void initAudioResourceInfo(int set, void *info) override;
+ virtual void selectAudioResourceSet(int set) override;
+ virtual bool hasSoundFile(uint file) const override;
+ virtual void loadSoundFile(uint file) override;
+ virtual void loadSoundFile(Common::String) override {}
- virtual void playTrack(uint8 track);
- virtual void haltTrack();
- virtual void beginFadeOut();
+ virtual void playTrack(uint8 track) override;
+ virtual void haltTrack() override;
+ virtual void beginFadeOut() override;
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) override { return -1; }
- virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF);
+ virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF) override;
protected:
Audio::MaxTrax *_driver;
Commit: 067d4779fac274986e926710015e19084b977e55
https://github.com/scummvm/scummvm/commit/067d4779fac274986e926710015e19084b977e55
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:21:45+02:00
Commit Message:
MACVENTURE: Fix meta engine class definition
Changed paths:
engines/macventure/detection.cpp
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index ba583ef..c179647 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -63,18 +63,19 @@ public:
_md5Bytes = 5000000; // TODO: Upper limit, adjust it once all games are added
}
- virtual const char *getName() const override {
+ const char *getName() const {
return "MacVenture";
}
- virtual const char *getOriginalCopyright() const override {
+ const char *getOriginalCopyright() const {
return "(C) ICOM Simulations";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
+protected:
+ bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ bool hasFeature(MetaEngineFeature f) const;
+ SaveStateList listSaves(const char *target) const;
+ int getMaximumSaveSlot() const;
+ void removeSaveState(const char *target, int slot) const;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
};
Commit: 283f7485e3839c9db410a0e8a8c9e0da355f36b3
https://github.com/scummvm/scummvm/commit/283f7485e3839c9db410a0e8a8c9e0da355f36b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:28:12+02:00
Commit Message:
GUI: Added override clauses
Changed paths:
gui/about.h
diff --git a/gui/about.h b/gui/about.h
index b651077..a6b13cd 100644
--- a/gui/about.h
+++ b/gui/about.h
@@ -46,15 +46,15 @@ protected:
public:
AboutDialog();
- void open();
- void close();
+ void open() override;
+ void close() override;
void drawDialog(DrawLayer layerToDraw) override;
- void handleTickle();
- void handleMouseUp(int x, int y, int button, int clickCount);
- void handleKeyDown(Common::KeyState state);
- void handleKeyUp(Common::KeyState state);
+ void handleTickle() override;
+ void handleMouseUp(int x, int y, int button, int clickCount) override;
+ void handleKeyDown(Common::KeyState state) override;
+ void handleKeyUp(Common::KeyState state) override;
- void reflowLayout();
+ void reflowLayout() override;
};
} // End of namespace GUI
Commit: f54e528677ce3eb29498676cf836ba2bfe82828c
https://github.com/scummvm/scummvm/commit/f54e528677ce3eb29498676cf836ba2bfe82828c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:28:27+02:00
Commit Message:
MOHAWK: Added override clauses
Changed paths:
engines/mohawk/cstime.h
engines/mohawk/dialogs.h
engines/mohawk/livingbooks.h
engines/mohawk/riven.h
diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h
index 1c39a86..9edd185 100644
--- a/engines/mohawk/cstime.h
+++ b/engines/mohawk/cstime.h
@@ -129,7 +129,7 @@ enum CSTimeState {
class MohawkEngine_CSTime : public MohawkEngine {
protected:
- Common::Error run();
+ Common::Error run() override;
public:
MohawkEngine_CSTime(OSystem *syst, const MohawkGameDescription *gamedesc);
@@ -142,7 +142,7 @@ public:
CSTimeGraphics *_gfx;
bool _needsUpdate;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
CSTimeView *getView() { return _view; }
CSTimeCase *getCase() { return _case; }
CSTimeInterface *getInterface() { return _interface; }
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index efc1005..d7e822c 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -116,7 +116,7 @@ public:
virtual ~MystOptionsDialog();
virtual void open() override;
- virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+ virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
private:
MohawkEngine_Myst *_vm;
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 4b87b64..4649b9f 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -707,7 +707,7 @@ protected:
class MohawkEngine_LivingBooks : public MohawkEngine {
protected:
- Common::Error run();
+ Common::Error run() override;
public:
MohawkEngine_LivingBooks(OSystem *syst, const MohawkGameDescription *gamedesc);
@@ -725,7 +725,7 @@ public:
Common::SeekableSubReadStreamEndian *wrapStreamEndian(uint32 tag, uint16 id);
Common::String readString(Common::ReadStream *stream);
Common::Rect readRect(Common::ReadStreamEndian *stream);
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
void addArchive(Archive *archive);
void removeArchive(Archive *archive);
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index 86a4311..def218d 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -79,7 +79,7 @@ typedef Common::HashMap<Common::String, uint32, Common::IgnoreCase_Hash, Common:
class MohawkEngine_Riven : public MohawkEngine {
protected:
- Common::Error run();
+ Common::Error run() override;
public:
MohawkEngine_Riven(OSystem *syst, const MohawkGameDescription *gamedesc);
@@ -95,13 +95,13 @@ public:
// Display debug rectangles around the hotspots
bool _showHotspots;
- GUI::Debugger *getDebugger();
+ GUI::Debugger *getDebugger() override;
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool hasFeature(EngineFeature f) const;
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool hasFeature(EngineFeature f) const override;
void doFrame();
Commit: 378d9153b6e56587e05c238ed9dd0825b892bd25
https://github.com/scummvm/scummvm/commit/378d9153b6e56587e05c238ed9dd0825b892bd25
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:29:28+02:00
Commit Message:
PEGASUS: Add override specifier
Changed paths:
engines/pegasus/items/biochips/pegasuschip.h
diff --git a/engines/pegasus/items/biochips/pegasuschip.h b/engines/pegasus/items/biochips/pegasuschip.h
index b81df94..31cd778 100644
--- a/engines/pegasus/items/biochips/pegasuschip.h
+++ b/engines/pegasus/items/biochips/pegasuschip.h
@@ -36,7 +36,7 @@ public:
PegasusChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
virtual ~PegasusChip();
- void select();
+ void select() override;
void takeSharedArea() override;
Commit: 22b674777fcfe88ec930c6f62f8675e2774b8b41
https://github.com/scummvm/scummvm/commit/22b674777fcfe88ec930c6f62f8675e2774b8b41
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:35:22+02:00
Commit Message:
SCI: Added overried specifiers
Changed paths:
engines/sci/sound/drivers/midi.cpp
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 46d08a5..889a875 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -143,25 +143,25 @@ public:
MidiPlayer_Midi(SciVersion version);
virtual ~MidiPlayer_Midi();
- int open(ResourceManager *resMan);
- void close();
- void send(uint32 b);
- void sysEx(const byte *msg, uint16 length);
- bool hasRhythmChannel() const { return true; }
- byte getPlayId() const;
- int getPolyphony() const {
+ int open(ResourceManager *resMan) override;
+ void close() override;
+ void send(uint32 b) override;
+ void sysEx(const byte *msg, uint16 length) override;
+ bool hasRhythmChannel() const override { return true; }
+ byte getPlayId() const override;
+ int getPolyphony() const override {
if (g_sci && g_sci->_features->useAltWinGMSound())
return 16;
else
return kVoices;
}
- int getFirstChannel() const;
- int getLastChannel() const;
- void setVolume(byte volume);
+ int getFirstChannel() const override;
+ int getLastChannel() const override;
+ void setVolume(byte volume) override;
virtual void onNewSound() override;
- int getVolume();
- void setReverb(int8 reverb);
- void playSwitch(bool play);
+ int getVolume() override;
+ void setReverb(int8 reverb) override;
+ void playSwitch(bool play) override;
private:
bool isMt32GmPatch(const SciSpan<const byte> &data);
Commit: ea7f92bb218f3b00e89fc8a3361ed3e3069af789
https://github.com/scummvm/scummvm/commit/ea7f92bb218f3b00e89fc8a3361ed3e3069af789
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:42:51+02:00
Commit Message:
XEEN: Added override specifier
Changed paths:
engines/xeen/files.h
diff --git a/engines/xeen/files.h b/engines/xeen/files.h
index 9924b8c..08aa3cd 100644
--- a/engines/xeen/files.h
+++ b/engines/xeen/files.h
@@ -83,7 +83,7 @@ public:
* Constructor
*/
FileManager(XeenEngine *vm);
-
+
/**
* Destructor
*/
@@ -373,7 +373,7 @@ public:
/**
* Finishes any pending writes, pushing out the written data
*/
- void finalize();
+ void finalize() override;
/**
* Writes data
Commit: b0affe5bf2c7240afb8f16c9b9476a049941439f
https://github.com/scummvm/scummvm/commit/b0affe5bf2c7240afb8f16c9b9476a049941439f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-28T12:47:23+02:00
Commit Message:
GUI: Added override specifiers
Changed paths:
gui/Tooltip.h
gui/console.h
gui/widgets/popup.cpp
gui/widgets/tab.h
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index 64496ff..e812ebe 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -42,29 +42,29 @@ public:
void drawDialog(DrawLayer layerToDraw) override;
- virtual void receivedFocus(int x = -1, int y = -1) {}
+ virtual void receivedFocus(int x = -1, int y = -1) override {}
protected:
- virtual void handleMouseDown(int x, int y, int button, int clickCount) {
+ virtual void handleMouseDown(int x, int y, int button, int clickCount) override {
close();
_parent->handleMouseDown(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
}
- virtual void handleMouseUp(int x, int y, int button, int clickCount) {
+ virtual void handleMouseUp(int x, int y, int button, int clickCount) override {
close();
_parent->handleMouseUp(x + (getAbsX() - _parent->getAbsX()), y + (getAbsY() - _parent->getAbsY()), button, clickCount);
}
- virtual void handleMouseWheel(int x, int y, int direction) {
+ virtual void handleMouseWheel(int x, int y, int direction) override {
close();
_parent->handleMouseWheel(x + (getAbsX() - _parent->getAbsX()), y + (getAbsX() - _parent->getAbsX()), direction);
}
- virtual void handleKeyDown(Common::KeyState state) {
+ virtual void handleKeyDown(Common::KeyState state) override {
close();
_parent->handleKeyDown(state);
}
- virtual void handleKeyUp(Common::KeyState state) {
+ virtual void handleKeyUp(Common::KeyState state) override {
close();
_parent->handleKeyUp(state);
}
- virtual void handleMouseMoved(int x, int y, int button) {
+ virtual void handleMouseMoved(int x, int y, int button) override {
close();
}
diff --git a/gui/console.h b/gui/console.h
index 04ad552..5cd0e43 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -130,15 +130,15 @@ protected:
public:
ConsoleDialog(float widthPercent, float heightPercent);
- void open();
- void close();
+ void open() override;
+ void close() override;
void drawDialog(DrawLayer layerToDraw) override;
- void handleTickle();
- void reflowLayout();
- void handleMouseWheel(int x, int y, int direction);
- void handleKeyDown(Common::KeyState state);
- void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+ void handleTickle() override;
+ void reflowLayout() override;
+ void handleMouseWheel(int x, int y, int direction) override;
+ void handleKeyDown(Common::KeyState state) override;
+ void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
int printFormat(int dummy, const char *format, ...) GCC_PRINTF(3, 4);
int vprintFormat(int dummy, const char *format, va_list argptr);
diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 40af769..65c9dea 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -50,10 +50,10 @@ public:
void drawDialog(DrawLayer layerToDraw) override;
- void handleMouseUp(int x, int y, int button, int clickCount);
- void handleMouseWheel(int x, int y, int direction); // Scroll through entries with scroll wheel
- void handleMouseMoved(int x, int y, int button); // Redraw selections depending on mouse position
- void handleKeyDown(Common::KeyState state); // Scroll through entries with arrow keys etc.
+ void handleMouseUp(int x, int y, int button, int clickCount) override;
+ void handleMouseWheel(int x, int y, int direction) override; // Scroll through entries with scroll wheel
+ void handleMouseMoved(int x, int y, int button) override; // Redraw selections depending on mouse position
+ void handleKeyDown(Common::KeyState state) override; // Scroll through entries with arrow keys etc.
protected:
void drawMenuEntry(int entry, bool hilite);
diff --git a/gui/widgets/tab.h b/gui/widgets/tab.h
index bdd3e56..f85d30a 100644
--- a/gui/widgets/tab.h
+++ b/gui/widgets/tab.h
@@ -101,15 +101,15 @@ public:
_tabs[tabID].title = title;
}
- virtual void handleMouseDown(int x, int y, int button, int clickCount);
- virtual bool handleKeyDown(Common::KeyState state);
- virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+ virtual void handleMouseDown(int x, int y, int button, int clickCount) override;
+ virtual bool handleKeyDown(Common::KeyState state) override;
+ virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
virtual int getFirstVisible() const;
virtual void setFirstVisible(int tabID, bool adjustIfRoom = false);
- virtual bool containsWidget(Widget *) const;
+ virtual bool containsWidget(Widget *) const override;
- virtual void reflowLayout();
+ virtual void reflowLayout() override;
void draw() override;
void markAsDirty() override;
@@ -117,12 +117,12 @@ public:
protected:
// We overload getChildY to make sure child widgets are positioned correctly.
// Essentially this compensates for the space taken up by the tab title header.
- virtual int16 getChildY() const;
- virtual uint16 getHeight() const;
+ virtual int16 getChildY() const override;
+ virtual uint16 getHeight() const override;
- virtual void drawWidget();
+ virtual void drawWidget() override;
- virtual Widget *findWidget(int x, int y);
+ virtual Widget *findWidget(int x, int y) override;
virtual void adjustTabs(int value);
More information about the Scummvm-git-logs
mailing list