[Scummvm-git-logs] scummvm master -> b0fba6d0f3a2eaf472ba3a125614760fcefcc4f9
sev-
sev at scummvm.org
Fri Jan 31 13:59:50 UTC 2020
This automated email contains information about 43 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
02aee2f328 GLK: Fix warnings
d804afbe70 ENGINES: Add override markers where appropriate
507dd5c178 COMMON: Mark methods as override
6817478967 BACKENDS: SDL: Add override keywords
ff17803dfc SCUMM: Add override keywords
58499ef0cd ADL: Add override keywords
6a4d7babd9 AGI: Add override keywords
205da837b4 AGOS: Added override keywords
03fafe8cb7 BLADERUNNER: Added override keywords
7ca9b7b73e CGE: Added override keywords
1413dfb0a7 CGE2: Added override keywords
584bc71966 CRYOMNI3D: Add override keywords
5d1794d72e JANITORIAL: Whitespace fixes
cbd9085657 DIRECTOR: Added override keywords
c362e7b0f0 DIRECTOR: Added copyright years
2317e82776 DIRECTOR: Hide 'register' keyword as deprecated in C++17
118f0d26bd GLK: Add override keywords
0595e9ba4a JANITORIAL: Whitespace fixes
cad4b06dd9 GLK: More override keywords
aa5add6a72 GLK: Remove obsolete keyword
e8c5c8dcea GLK: Marked problematic spots and fixed couple of obvious bugs
ec9dd98114 GOB: Added override keywords
299de83188 KYRA: Added override keywords
f9c0d1c827 MACVENTURE: Added override keywords
567ca7f402 MADE: Added detection keywords
fa8afb37a8 MOHAWK: Added missing override keyword
02aec5976d MUTATIONOFJB: Added override commands
4187038c62 PEGASUS: Added override keywords
eae52773dd PINK: Added override keywords
7e43cad1bc QUEEN: Added override keywords
a4821672ca SCI: Added override keywords
0fa8986a29 SHERLOCK: Fix clashing enums
88ae01298e SKY: Added override keywords
50fcecbc57 SLUDGE: Added override keywords
9801396f9f SWORD1: Added override keywords
bd282d5aef SWORD2: Added override keywords
556e2d72ce TINSEL: Added override keywords
44ad78be98 TOON: Added override keywords
7b3fbbdd95 TOUCHE: Added override keywords
8118ce8375 TUCKER: Added override keywords
5dd49de0b3 SWORD25: Add override keywords
9c92773844 COMMON: Add override keywords
b0fba6d0f3 GRAPHICS: Added override keywords
Commit: 02aee2f3283410280413e3932b011ef1d55e4dc2
https://github.com/scummvm/scummvm/commit/02aee2f3283410280413e3932b011ef1d55e4dc2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:26:29+01:00
Commit Message:
GLK: Fix warnings
Changed paths:
engines/glk/jacl/parser.cpp
engines/glk/level9/detection_tables.h
engines/glk/quest/geas_runner.cpp
diff --git a/engines/glk/jacl/parser.cpp b/engines/glk/jacl/parser.cpp
index d37f4d1..4aa5ed3 100644
--- a/engines/glk/jacl/parser.cpp
+++ b/engines/glk/jacl/parser.cpp
@@ -547,7 +547,7 @@ struct word_type *object_match(struct word_type *iterator, int noun_number) {
do {
/* THIS LOOP MEANS THAT CERTAIN ERRORS SUCH AS TAKING FROM A
* CLOSED CONTAINER CAN OCCUR MORE THAN ONCE */
- if ((iterator->word[0] == '*')) {
+ if (iterator->word[0] == '*') {
object_was_option = TRUE;
if (build_object_list(iterator, noun_number)) {
/* RETURN THE POINT IN THE GRAMMAR TREE THAT MATCHED TO
diff --git a/engines/glk/level9/detection_tables.h b/engines/glk/level9/detection_tables.h
index cb3029b..d4e3da3 100644
--- a/engines/glk/level9/detection_tables.h
+++ b/engines/glk/level9/detection_tables.h
@@ -770,11 +770,11 @@ static const gln_patch_table_t GLN_PATCH_TABLE[] = {
};
const L9V1GameInfo L9_V1_GAMES[] = {
- 0x1a, 0x24, 301, { 0x0000, -0x004b, 0x0080, -0x002b, 0x00d0 }, 0x03b0, 0x0f80, 0x4857, /* Colossal Adventure */
- 0x20, 0x3b, 283, { -0x0583, 0x0000, -0x0508, -0x04e0, 0x0000 }, 0x0800, 0x1000, 0x39d1, /* Adventure Quest */
- 0x14, 0xff, 153, { -0x00d6, 0x0000, 0x0000, 0x0000, 0x0000 }, 0x0a20, 0x16bf, 0x420d, /* Dungeon Adventure */
- 0x15, 0x5d, 252, { -0x3e70, 0x0000, -0x3d30, -0x3ca0, 0x0100 }, 0x4120, -0x3b9d, 0x3988, /* Lords of Time */
- 0x15, 0x6c, 284, { -0x00f0, 0x0000, -0x0050, -0x0050, -0x0050 }, 0x0300, 0x1930, 0x3c17, /* Snowball */
+ { 0x1a, 0x24, 301, { 0x0000, -0x004b, 0x0080, -0x002b, 0x00d0 }, 0x03b0, 0x0f80, 0x4857 }, /* Colossal Adventure */
+ { 0x20, 0x3b, 283, { -0x0583, 0x0000, -0x0508, -0x04e0, 0x0000 }, 0x0800, 0x1000, 0x39d1 }, /* Adventure Quest */
+ { 0x14, 0xff, 153, { -0x00d6, 0x0000, 0x0000, 0x0000, 0x0000 }, 0x0a20, 0x16bf, 0x420d }, /* Dungeon Adventure */
+ { 0x15, 0x5d, 252, { -0x3e70, 0x0000, -0x3d30, -0x3ca0, 0x0100 }, 0x4120, -0x3b9d, 0x3988 }, /* Lords of Time */
+ { 0x15, 0x6c, 284, { -0x00f0, 0x0000, -0x0050, -0x0050, -0x0050 }, 0x0300, 0x1930, 0x3c17 } /* Snowball */
};
const GlkDetectionEntry LEVEL9_GAMES[] = {
diff --git a/engines/glk/quest/geas_runner.cpp b/engines/glk/quest/geas_runner.cpp
index 3868141..37e1a54 100644
--- a/engines/glk/quest/geas_runner.cpp
+++ b/engines/glk/quest/geas_runner.cpp
@@ -1070,7 +1070,7 @@ void geas_implementation::run_command(String s) {
oss << state;
print_normal(oss.str());
return;
-
+
} else if (s == "undo") {
if (undo_buffer.size() < 2) {
print_formatted("(No more undo information available!)");
@@ -1080,12 +1080,12 @@ void geas_implementation::run_command(String s) {
state = undo_buffer.peek();
print_formatted("Undone.");
return;
-
+
} else if (s == "save") {
if (g_vm->saveGame().getCode() == Common::kNoError)
print_formatted("Saved.");
return;
-
+
} else if (s == "restore") {
if (g_vm->loadGame().getCode() == Common::kNoError)
run_command("look");
@@ -1425,7 +1425,7 @@ bool geas_implementation::run_commands(String cmd, const GeasBlock *room, bool i
Common::Array<String> tmp = split_param(param_contents(tok));
for (uint j = 0; j < tmp.size(); j++)
- if (match = match_command(cmd, tmp[j])) {
+ if ((match = match_command(cmd, tmp[j]))) {
if (!dereference_vars(match.bindings, is_internal))
return false;
set_vars(match.bindings);
@@ -1505,12 +1505,12 @@ bool geas_implementation::try_match(String cmd, bool is_internal, bool is_normal
return true;
}
- if (match = match_command(cmd, "look")) {
+ if ((match = match_command(cmd, "look"))) {
look();
return true;
}
- if (match = match_command(cmd, "give #@first# to #@second#")) {
+ if ((match = match_command(cmd, "give #@first# to #@second#"))) {
if (!dereference_vars(match.bindings, is_internal))
return true;
String script, first = match.bindings[0].var_text, second = match.bindings[1].var_text;
@@ -1572,7 +1572,7 @@ bool geas_implementation::try_match(String cmd, bool is_internal, bool is_normal
return true;
}
- if (match = match_command(cmd, "use #@first#")) {
+ if ((match = match_command(cmd, "use #@first#"))) {
if (!dereference_vars(match.bindings, is_internal))
return true;
String tmp, obj = match.bindings[0].var_text;
@@ -1621,7 +1621,7 @@ bool geas_implementation::try_match(String cmd, bool is_internal, bool is_normal
}
- if (match = match_command(cmd, "drop #@object#")) {
+ if ((match = match_command(cmd, "drop #@object#"))) {
if (!dereference_vars(match.bindings, is_internal))
return true;
String scr, obj = match.bindings[0].var_text;
Commit: d804afbe7075700c4ade8bea8be64e5f69373574
https://github.com/scummvm/scummvm/commit/d804afbe7075700c4ade8bea8be64e5f69373574
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:26:29+01:00
Commit Message:
ENGINES: Add override markers where appropriate
Changed paths:
engines/advancedDetector.h
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 088dfea..ee15368 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -258,9 +258,9 @@ public:
DetectedGames detectGames(const Common::FSList &fslist) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
- virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
protected:
// To be implemented by subclasses
Commit: 507dd5c178415814030473550680ec2a9a8e30fc
https://github.com/scummvm/scummvm/commit/507dd5c178415814030473550680ec2a9a8e30fc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:26:29+01:00
Commit Message:
COMMON: Mark methods as override
Changed paths:
common/file.h
common/memstream.h
diff --git a/common/file.h b/common/file.h
index ea7619b..2d5232a 100644
--- a/common/file.h
+++ b/common/file.h
@@ -117,14 +117,14 @@ public:
*/
const char *getName() const { return _name.c_str(); }
- bool err() const; // implement abstract Stream method
- void clearErr(); // implement abstract Stream method
- bool eos() const; // implement abstract SeekableReadStream method
-
- int32 pos() const; // implement abstract SeekableReadStream method
- int32 size() const; // implement abstract SeekableReadStream method
- bool seek(int32 offs, int whence = SEEK_SET); // implement abstract SeekableReadStream method
- uint32 read(void *dataPtr, uint32 dataSize); // implement abstract SeekableReadStream method
+ bool err() const override; // implement abstract Stream method
+ void clearErr() override; // implement abstract Stream method
+ bool eos() const override; // implement abstract SeekableReadStream method
+
+ int32 pos() const override; // implement abstract SeekableReadStream method
+ int32 size() const override; // implement abstract SeekableReadStream method
+ bool seek(int32 offs, int whence = SEEK_SET) override; // implement abstract SeekableReadStream method
+ uint32 read(void *dataPtr, uint32 dataSize) override; // implement abstract SeekableReadStream method
};
@@ -155,8 +155,8 @@ public:
*/
bool isOpen() const;
- bool err() const;
- void clearErr();
+ bool err() const override;
+ void clearErr() override;
virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
diff --git a/common/memstream.h b/common/memstream.h
index 68cfdce..187b562 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -98,7 +98,7 @@ protected:
public:
MemoryWriteStream(byte *buf, uint32 len) : _ptr(buf), _bufSize(len), _pos(0), _err(false) {}
- uint32 write(const void *dataPtr, uint32 dataSize) {
+ uint32 write(const void *dataPtr, uint32 dataSize) override {
// Write at most as many bytes as are still available...
if (dataSize > _bufSize - _pos) {
dataSize = _bufSize - _pos;
@@ -197,7 +197,7 @@ public:
free(_data);
}
- uint32 write(const void *dataPtr, uint32 dataSize) {
+ uint32 write(const void *dataPtr, uint32 dataSize) override {
ensureCapacity(_pos + dataSize);
memcpy(_ptr, dataPtr, dataSize);
_ptr += dataSize;
@@ -283,7 +283,7 @@ public:
free(_data);
}
- uint32 write(const void *dataPtr, uint32 dataSize) {
+ uint32 write(const void *dataPtr, uint32 dataSize) override {
ensureCapacity(_length + dataSize);
if (_writePos + dataSize < _capacity) {
memcpy(_data + _writePos, dataPtr, dataSize);
Commit: 68174789670d7e1155e240c45b02a07441cababb
https://github.com/scummvm/scummvm/commit/68174789670d7e1155e240c45b02a07441cababb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:39:23+01:00
Commit Message:
BACKENDS: SDL: Add override keywords
Changed paths:
backends/graphics/surfacesdl/surfacesdl-graphics.h
backends/platform/sdl/posix/posix.h
backends/platform/sdl/sdl.h
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h
index d4e6dc1..636619e 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.h
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h
@@ -425,7 +425,7 @@ protected:
virtual void setAspectRatioCorrection(bool enable);
void setFilteringMode(bool enable);
- virtual bool saveScreenshot(const Common::String &filename) const;
+ virtual bool saveScreenshot(const Common::String &filename) const override;
virtual void setGraphicsModeIntern();
private:
diff --git a/backends/platform/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h
index 41fdc35..af4763e 100644
--- a/backends/platform/sdl/posix/posix.h
+++ b/backends/platform/sdl/posix/posix.h
@@ -27,26 +27,26 @@
class OSystem_POSIX : public OSystem_SDL {
public:
- virtual bool hasFeature(Feature f);
+ virtual bool hasFeature(Feature f) override;
- virtual bool displayLogFile();
+ virtual bool displayLogFile() override;
- virtual bool openUrl(const Common::String &url);
+ virtual bool openUrl(const Common::String &url) override;
- virtual void init();
- virtual void initBackend();
+ virtual void init() override;
+ virtual void initBackend() override;
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+ virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
Common::String getScreenshotsPath() override;
protected:
- virtual Common::String getDefaultConfigFileName();
- virtual Common::String getDefaultLogFileName();
+ virtual Common::String getDefaultConfigFileName() override;
+ virtual Common::String getDefaultLogFileName() override;
Common::String getXdgUserDir(const char *name);
- virtual AudioCDManager *createAudioCDManager();
+ virtual AudioCDManager *createAudioCDManager() override;
bool launchBrowser(const Common::String& client, const Common::String &url);
};
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 1cee826..f73484a 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -55,37 +55,37 @@ public:
*/
virtual SdlMixerManager *getMixerManager();
- virtual bool hasFeature(Feature f);
+ virtual bool hasFeature(Feature f) override;
// Override functions from ModularBackend and OSystem
- virtual void initBackend();
- virtual void engineInit();
- virtual void engineDone();
- virtual void quit();
- virtual void fatalError();
+ virtual void initBackend() override;
+ virtual void engineInit() override;
+ virtual void engineDone() override;
+ virtual void quit() override;
+ virtual void fatalError() override;
Common::KeymapArray getGlobalKeymaps() override;
Common::HardwareInputSet *getHardwareInputSet() override;
// Logging
- virtual void logMessage(LogMessageType::Type type, const char *message);
+ virtual void logMessage(LogMessageType::Type type, const char *message) override;
- virtual Common::String getSystemLanguage() const;
+ virtual Common::String getSystemLanguage() const override;
#if SDL_VERSION_ATLEAST(2, 0, 0)
// Clipboard
- virtual bool hasTextInClipboard();
- virtual Common::String getTextFromClipboard();
- virtual bool setTextInClipboard(const Common::String &text);
+ virtual bool hasTextInClipboard() override;
+ virtual Common::String getTextFromClipboard() override;
+ virtual bool setTextInClipboard(const Common::String &text) override;
#endif
- virtual void setWindowCaption(const char *caption);
- virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
- virtual uint32 getMillis(bool skipRecord = false);
- virtual void delayMillis(uint msecs);
- virtual void getTimeAndDate(TimeDate &td) const;
- virtual Audio::Mixer *getMixer();
- virtual Common::TimerManager *getTimerManager();
- virtual Common::SaveFileManager *getSavefileManager();
+ virtual void setWindowCaption(const char *caption) override;
+ virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
+ virtual uint32 getMillis(bool skipRecord = false) override;
+ virtual void delayMillis(uint msecs) override;
+ virtual void getTimeAndDate(TimeDate &td) const override;
+ virtual Audio::Mixer *getMixer() override;
+ virtual Common::TimerManager *getTimerManager() override;
+ virtual Common::SaveFileManager *getSavefileManager() override;
//Screenshots
virtual Common::String getScreenshotsPath();
@@ -123,7 +123,7 @@ protected:
*/
SdlWindow *_window;
- virtual Common::EventSource *getDefaultEventSource() { return _eventSource; }
+ virtual Common::EventSource *getDefaultEventSource() override { return _eventSource; }
/**
* Initialze the SDL library.
@@ -156,13 +156,13 @@ protected:
*/
void setupGraphicsModes();
- virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
- virtual int getDefaultGraphicsMode() const;
- virtual bool setGraphicsMode(int mode);
- virtual int getGraphicsMode() const;
+ virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
+ virtual int getDefaultGraphicsMode() const override;
+ virtual bool setGraphicsMode(int mode) override;
+ virtual int getGraphicsMode() const override;
#endif
protected:
- virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length);
+ virtual char *convertEncoding(const char *to, const char *from, const char *string, size_t length) override;
};
#endif
Commit: ff17803dfc3313bb517a3afaf5e2af65cbb84b48
https://github.com/scummvm/scummvm/commit/ff17803dfc3313bb517a3afaf5e2af65cbb84b48
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:42:07+01:00
Commit Message:
SCUMM: Add override keywords
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 029b098..a7c9698 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -968,25 +968,25 @@ using namespace Scumm;
class ScummMetaEngine : public MetaEngine {
public:
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "scumm";
}
- virtual const char *getName() const;
- virtual const char *getOriginalCopyright() const;
+ virtual const char *getName() const override;
+ virtual const char *getOriginalCopyright() const override;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
PlainGameList getSupportedGames() const override;
PlainGameDescriptor findGame(const char *gameid) const override;
virtual DetectedGames detectGames(const Common::FSList &fslist) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
};
bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 58499ef0cdcd5156404a752ee9b60bd903fcdff3
https://github.com/scummvm/scummvm/commit/58499ef0cdcd5156404a752ee9b60bd903fcdff3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:44:40+01:00
Commit Message:
ADL: Add override keywords
Changed paths:
engines/adl/detection.cpp
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 6496290..2ff63f0 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -368,7 +368,7 @@ public:
return "ADL";
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "adl";
}
Commit: 6a4d7babd978272f11f0c4fdfea331e532debf3f
https://github.com/scummvm/scummvm/commit/6a4d7babd978272f11f0c4fdfea331e532debf3f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:44:55+01:00
Commit Message:
AGI: Add override keywords
Changed paths:
engines/agi/detection.cpp
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 73f2e8e..04bbfd4 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -205,24 +205,24 @@ public:
_guiOptions = GUIO1(GUIO_NOSPEECH);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "agi";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "AGI preAGI + v2 + v3";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Sierra AGI Engine (C) Sierra On-Line Software";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ 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;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
};
Commit: 205da837b40997422fa9883f960a228a417c5171
https://github.com/scummvm/scummvm/commit/205da837b40997422fa9883f960a228a417c5171
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:49:29+01:00
Commit Message:
AGOS: Added override keywords
Changed paths:
engines/agos/detection.cpp
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 568e207..26a2d39 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -103,28 +103,28 @@ public:
return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "agos";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "AGOS";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "AGOS (C) Adventure Soft";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override {
Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
return AdvancedMetaEngine::createInstance(syst, engine);
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
};
bool AgosMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 03fafe8cb7e865d343fb94e432580f1216027dc7
https://github.com/scummvm/scummvm/commit/03fafe8cb7e865d343fb94e432580f1216027dc7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:53:02+01:00
Commit Message:
BLADERUNNER: Added override keywords
Changed paths:
engines/bladerunner/bladerunner.h
engines/bladerunner/detection.cpp
engines/bladerunner/ui/kia_section_clues.h
engines/bladerunner/ui/kia_section_crimes.h
engines/bladerunner/ui/kia_section_settings.h
engines/bladerunner/ui/kia_section_suspects.h
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index c033e16..c2094c1 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -301,7 +301,7 @@ public:
bool closeArchive(const Common::String &name);
bool isArchiveOpen(const Common::String &name) const;
- void syncSoundSettings();
+ void syncSoundSettings() override;
bool isSubtitlesEnabled();
void setSubtitlesEnabled(bool newVal);
@@ -322,7 +322,7 @@ public:
void blitToScreen(const Graphics::Surface &src) const;
Graphics::Surface generateThumbnail() const;
- GUI::Debugger *getDebugger();
+ GUI::Debugger *getDebugger() override;
Common::String getTargetName() const;
};
diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp
index 210774b..c413b2b 100644
--- a/engines/bladerunner/detection.cpp
+++ b/engines/bladerunner/detection.cpp
@@ -87,7 +87,7 @@ class BladeRunnerMetaEngine : public AdvancedMetaEngine {
public:
BladeRunnerMetaEngine();
- const char *getEngineId() const;
+ const char *getEngineId() const override;
const char *getName() const override;
const char *getOriginalCopyright() const override;
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
diff --git a/engines/bladerunner/ui/kia_section_clues.h b/engines/bladerunner/ui/kia_section_clues.h
index 9910102..6807288 100644
--- a/engines/bladerunner/ui/kia_section_clues.h
+++ b/engines/bladerunner/ui/kia_section_clues.h
@@ -85,7 +85,7 @@ private:
static void scrollBoxCallback(void *callbackData, void *source, int lineData, int mouseButton);
static void mouseUpCallback(int buttonId, void *callbackData);
- void onButtonPressed(int buttonId);
+ void onButtonPressed(int buttonId) override;
void enableAllFilters();
void disableAllFilters();
diff --git a/engines/bladerunner/ui/kia_section_crimes.h b/engines/bladerunner/ui/kia_section_crimes.h
index 896a6aa..ff20762 100644
--- a/engines/bladerunner/ui/kia_section_crimes.h
+++ b/engines/bladerunner/ui/kia_section_crimes.h
@@ -100,7 +100,7 @@ private:
static void scrollBoxCallback(void *callbackData, void *source, int lineData, int mouseButton);
static void mouseUpCallback(int buttonId, void *callbackData);
- void onButtonPressed(int buttonId);
+ void onButtonPressed(int buttonId) override;
void populateAcquiredClues();
void populateCrimes();
diff --git a/engines/bladerunner/ui/kia_section_settings.h b/engines/bladerunner/ui/kia_section_settings.h
index 55ba5b6..77c3ada 100644
--- a/engines/bladerunner/ui/kia_section_settings.h
+++ b/engines/bladerunner/ui/kia_section_settings.h
@@ -76,7 +76,7 @@ private:
static void mouseInCallback(int buttonId, void *callbackData);
static void mouseUpCallback(int buttonId, void *callbackData);
- void onButtonPressed(int buttonId);
+ void onButtonPressed(int buttonId) override;
void initConversationChoices();
};
diff --git a/engines/bladerunner/ui/kia_section_suspects.h b/engines/bladerunner/ui/kia_section_suspects.h
index dc96793..d913cbb 100644
--- a/engines/bladerunner/ui/kia_section_suspects.h
+++ b/engines/bladerunner/ui/kia_section_suspects.h
@@ -110,7 +110,7 @@ private:
static void checkBoxCallback(void *callbackData, void *source);
static void mouseUpCallback(int buttonId, void *callbackData);
- void onButtonPressed(int buttonId);
+ void onButtonPressed(int buttonId) override;
void populateAcquiredClues();
void populateSuspects();
Commit: 7ca9b7b73e4111b11937749f3ba6ea9537153f5e
https://github.com/scummvm/scummvm/commit/7ca9b7b73e4111b11937749f3ba6ea9537153f5e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:54:18+01:00
Commit Message:
CGE: Added override keywords
Changed paths:
engines/cge/detection.cpp
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 8a468dc..9305fb5 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -117,25 +117,25 @@ public:
CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cge";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "CGE";
}
- virtual const char *getOriginalCopyright() const {
+ virtual 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;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual int getMaximumSaveSlot() const;
- virtual SaveStateList listSaves(const char *target) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ 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;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
static ADGameDescription s_fallbackDesc = {
Commit: 1413dfb0a709e8bc6da0c1aaf76000552387a045
https://github.com/scummvm/scummvm/commit/1413dfb0a709e8bc6da0c1aaf76000552387a045
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:54:57+01:00
Commit Message:
CGE2: Added override keywords
Changed paths:
engines/cge2/detection.cpp
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index 5432a3b..b29c0c6 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -123,25 +123,25 @@ public:
CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cge2";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "CGE2";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Sfinx (C) 1994-1997 Janus B. Wisniewski and L.K. Avalon";
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual int getMaximumSaveSlot() const;
- virtual SaveStateList listSaves(const char *target) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual 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;
};
static ADGameDescription s_fallbackDesc = {
Commit: 584bc719667794ef6fade9f96d37c2e39107057e
https://github.com/scummvm/scummvm/commit/584bc719667794ef6fade9f96d37c2e39107057e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T12:58:49+01:00
Commit Message:
CRYOMNI3D: Add override keywords
Changed paths:
engines/cryomni3d/cryomni3d.h
engines/cryomni3d/detection.cpp
engines/cryomni3d/versailles/engine.h
diff --git a/engines/cryomni3d/cryomni3d.h b/engines/cryomni3d/cryomni3d.h
index d1b2e36..fe4879f 100644
--- a/engines/cryomni3d/cryomni3d.h
+++ b/engines/cryomni3d/cryomni3d.h
@@ -99,7 +99,7 @@ enum DragStatus {
class CryOmni3DEngine : public ::Engine {
protected:
- virtual Common::Error run();
+ virtual Common::Error run() override;
public:
CryOmni3DEngine(OSystem *syst, const CryOmni3DGameDescription *gamedesc);
@@ -121,7 +121,7 @@ public:
void setCanLoadSave(bool canLoadSave) { _canLoadSave = canLoadSave; }
static const uint kSaveDescriptionLen = 20;
private:
- void pauseEngineIntern(bool);
+ void pauseEngineIntern(bool) override;
public:
Image::ImageDecoder *loadHLZ(const Common::String &filename);
diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp
index 1a47b0d..ab44d6b 100644
--- a/engines/cryomni3d/detection.cpp
+++ b/engines/cryomni3d/detection.cpp
@@ -95,23 +95,23 @@ public:
return detectGameFilebased(allFiles, fslist, fileBased);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cryomni3d";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Cryo Omni3D";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Cryo game Engine (C) 1997-2002 Cryo Interactive";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const { return 999; }
- virtual void removeSaveState(const char *target, int slot) const;
+ 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 CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/cryomni3d/versailles/engine.h b/engines/cryomni3d/versailles/engine.h
index d3cc4c6..8de1e1d 100644
--- a/engines/cryomni3d/versailles/engine.h
+++ b/engines/cryomni3d/versailles/engine.h
@@ -261,7 +261,7 @@ private:
void loadStaticData();
void syncOmni3DSettings();
- void syncSoundSettings();
+ void syncSoundSettings() override;
void playTransitionEndLevel(int level);
void changeLevel(int level);
Commit: 5d1794d72eda7625c5301f0b261cea3a60311399
https://github.com/scummvm/scummvm/commit/5d1794d72eda7625c5301f0b261cea3a60311399
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:00:27+01:00
Commit Message:
JANITORIAL: Whitespace fixes
Changed paths:
engines/cryomni3d/detection.cpp
diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp
index ab44d6b..ea1ffa2 100644
--- a/engines/cryomni3d/detection.cpp
+++ b/engines/cryomni3d/detection.cpp
@@ -67,8 +67,8 @@ Common::Language CryOmni3DEngine::getLanguage() const {
bool CryOmni3DEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsRTL)
- || (f == kSupportsSubtitleOptions);
+ (f == kSupportsRTL)
+ || (f == kSupportsSubtitleOptions);
}
static const PlainGameDescriptor cryomni3DGames[] = {
@@ -85,13 +85,13 @@ static const ADExtraGuiOptionsMap optionsList[] = {
class CryOmni3DMetaEngine : public AdvancedMetaEngine {
public:
CryOmni3DMetaEngine() : AdvancedMetaEngine(CryOmni3D::gameDescriptions,
- sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) {
+ sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) {
_directoryGlobs = directoryGlobs;
_maxScanDepth = 5;
}
ADDetectedGame fallbackDetect(const FileMap &allFiles,
- const Common::FSList &fslist) const override {
+ const Common::FSList &fslist) const override {
return detectGameFilebased(allFiles, fslist, fileBased);
}
@@ -116,10 +116,10 @@ public:
bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const {
return
- (f == kSupportsListSaves)
- || (f == kSupportsLoadingDuringStartup)
- || (f == kSupportsDeleteSave)
- || (f == kSimpleSavesNames);
+ (f == kSupportsListSaves)
+ || (f == kSupportsLoadingDuringStartup)
+ || (f == kSupportsDeleteSave)
+ || (f == kSimpleSavesNames);
}
SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const {
@@ -138,7 +138,7 @@ SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const {
int slotNum;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end();
- ++file) {
+ ++file) {
// Obtain the last 4 digits of the filename, since they correspond to the save slot
slotNum = atoi(file->c_str() + file->size() - 4);
@@ -163,7 +163,7 @@ void CryOmni3DMetaEngine::removeSaveState(const char *target, int slot) const {
}
bool CryOmni3DMetaEngine::createInstance(OSystem *syst, Engine **engine,
- const ADGameDescription *desc) const {
+ const ADGameDescription *desc) const {
const CryOmni3DGameDescription *gd = (const CryOmni3DGameDescription *)desc;
if (gd) {
Commit: cbd9085657ff938d770f2f30c73492848850ec11
https://github.com/scummvm/scummvm/commit/cbd9085657ff938d770f2f30c73492848850ec11
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:04:45+01:00
Commit Message:
DIRECTOR: Added override keywords
Changed paths:
engines/director/detection.cpp
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 378c287..96d48c0 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -114,20 +114,20 @@ public:
_directoryGlobs = directoryGlobs;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "director";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Macromedia Director";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Macromedia Director (C) Macromedia";
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool DirectorMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
Commit: c362e7b0f0484aad44d8cfc7df5924067edb07dd
https://github.com/scummvm/scummvm/commit/c362e7b0f0484aad44d8cfc7df5924067edb07dd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:05:00+01:00
Commit Message:
DIRECTOR: Added copyright years
Changed paths:
engines/director/detection.cpp
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 96d48c0..4f6d7e1 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -123,7 +123,7 @@ public:
}
virtual const char *getOriginalCopyright() const override {
- return "Macromedia Director (C) Macromedia";
+ return "Macromedia Director (C) 1990-1995 Macromedia";
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
Commit: 2317e82776d2a0638d11c60f72e2202f27523ade
https://github.com/scummvm/scummvm/commit/2317e82776d2a0638d11c60f72e2202f27523ade
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:31:17+01:00
Commit Message:
DIRECTOR: Hide 'register' keyword as deprecated in C++17
It is used by autogenerated flex code, and has little sense on
the modern platforms.
Changed paths:
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 9cdd1ca..a72b4b5 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -839,6 +839,8 @@ char *yytext;
#include "director/lingo/lingo-gr.h"
#include "director/lingo/lingo-the.h"
+#define register
+
using namespace Director;
int yyparse();
@@ -876,7 +878,7 @@ static int checkImmediate(int token) {
return token;
}
-#line 880 "engines/director/lingo/lingo-lex.cpp"
+#line 882 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -1059,10 +1061,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 90 "engines/director/lingo/lingo-lex.l"
+#line 92 "engines/director/lingo/lingo-lex.l"
-#line 1066 "engines/director/lingo/lingo-lex.cpp"
+#line 1068 "engines/director/lingo/lingo-lex.cpp"
if ( !(yy_init) )
{
@@ -1145,82 +1147,82 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 92 "engines/director/lingo/lingo-lex.l"
+#line 94 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 93 "engines/director/lingo/lingo-lex.l"
+#line 95 "engines/director/lingo/lingo-lex.l"
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 94 "engines/director/lingo/lingo-lex.l"
+#line 96 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 95 "engines/director/lingo/lingo-lex.l"
+#line 97 "engines/director/lingo/lingo-lex.l"
{ count(); return ' '; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 97 "engines/director/lingo/lingo-lex.l"
+#line 99 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(yytext); return SYMBOL; } // D3
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 99 "engines/director/lingo/lingo-lex.l"
+#line 101 "engines/director/lingo/lingo-lex.l"
{ count(); return tAFTER; } // D3
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 100 "engines/director/lingo/lingo-lex.l"
+#line 102 "engines/director/lingo/lingo-lex.l"
{ count(); return tAND; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 101 "engines/director/lingo/lingo-lex.l"
+#line 103 "engines/director/lingo/lingo-lex.l"
{ count(); return tBEFORE; } // D3
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 102 "engines/director/lingo/lingo-lex.l"
+#line 104 "engines/director/lingo/lingo-lex.l"
{ count(); return tCHAR; } // D3
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 103 "engines/director/lingo/lingo-lex.l"
+#line 105 "engines/director/lingo/lingo-lex.l"
{ count(); return tCONTAINS; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 104 "engines/director/lingo/lingo-lex.l"
+#line 106 "engines/director/lingo/lingo-lex.l"
{ count(); return tDONE; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 105 "engines/director/lingo/lingo-lex.l"
+#line 107 "engines/director/lingo/lingo-lex.l"
{ count(); return tDOWN; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 106 "engines/director/lingo/lingo-lex.l"
+#line 108 "engines/director/lingo/lingo-lex.l"
{ count(); return tIF; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 107 "engines/director/lingo/lingo-lex.l"
+#line 109 "engines/director/lingo/lingo-lex.l"
{ count(); return tELSIF; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 108 "engines/director/lingo/lingo-lex.l"
+#line 110 "engines/director/lingo/lingo-lex.l"
{ count(); return tELSE; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 109 "engines/director/lingo/lingo-lex.l"
+#line 111 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1242,77 +1244,77 @@ YY_RULE_SETUP
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 127 "engines/director/lingo/lingo-lex.l"
+#line 129 "engines/director/lingo/lingo-lex.l"
{ count(); return tFACTORY; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 128 "engines/director/lingo/lingo-lex.l"
+#line 130 "engines/director/lingo/lingo-lex.l"
{ count(); return tEXIT; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 129 "engines/director/lingo/lingo-lex.l"
+#line 131 "engines/director/lingo/lingo-lex.l"
{ count(); return tGLOBAL; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 130 "engines/director/lingo/lingo-lex.l"
+#line 132 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 131 "engines/director/lingo/lingo-lex.l"
+#line 133 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 132 "engines/director/lingo/lingo-lex.l"
+#line 134 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 133 "engines/director/lingo/lingo-lex.l"
+#line 135 "engines/director/lingo/lingo-lex.l"
{ count(); return tINSTANCE; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 134 "engines/director/lingo/lingo-lex.l"
+#line 136 "engines/director/lingo/lingo-lex.l"
{ count(); return tINTERSECTS; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 135 "engines/director/lingo/lingo-lex.l"
+#line 137 "engines/director/lingo/lingo-lex.l"
{ count(); return tINTO; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 136 "engines/director/lingo/lingo-lex.l"
+#line 138 "engines/director/lingo/lingo-lex.l"
{ count(); return tIN; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 137 "engines/director/lingo/lingo-lex.l"
+#line 139 "engines/director/lingo/lingo-lex.l"
{ count(); return tITEM; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 138 "engines/director/lingo/lingo-lex.l"
+#line 140 "engines/director/lingo/lingo-lex.l"
{ count(); return tLINE; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 139 "engines/director/lingo/lingo-lex.l"
+#line 141 "engines/director/lingo/lingo-lex.l"
{ count(); return checkImmediate(tLOOP); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 140 "engines/director/lingo/lingo-lex.l"
+#line 142 "engines/director/lingo/lingo-lex.l"
{ count(); return tMACRO; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 141 "engines/director/lingo/lingo-lex.l"
+#line 143 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1327,87 +1329,87 @@ YY_RULE_SETUP
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 152 "engines/director/lingo/lingo-lex.l"
+#line 154 "engines/director/lingo/lingo-lex.l"
{ count(); return tMOD; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 153 "engines/director/lingo/lingo-lex.l"
+#line 155 "engines/director/lingo/lingo-lex.l"
{ count(); return tMOVIE; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 154 "engines/director/lingo/lingo-lex.l"
+#line 156 "engines/director/lingo/lingo-lex.l"
{ count(); return tNEXT; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 155 "engines/director/lingo/lingo-lex.l"
+#line 157 "engines/director/lingo/lingo-lex.l"
{ count(); return tNOT; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 156 "engines/director/lingo/lingo-lex.l"
+#line 158 "engines/director/lingo/lingo-lex.l"
{ count(); return tOF; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 157 "engines/director/lingo/lingo-lex.l"
+#line 159 "engines/director/lingo/lingo-lex.l"
{ count(); return tON; } // D3
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 158 "engines/director/lingo/lingo-lex.l"
+#line 160 "engines/director/lingo/lingo-lex.l"
{ count(); return tOPEN; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 159 "engines/director/lingo/lingo-lex.l"
+#line 161 "engines/director/lingo/lingo-lex.l"
{ count(); return tOR; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 160 "engines/director/lingo/lingo-lex.l"
+#line 162 "engines/director/lingo/lingo-lex.l"
{ count(); return tPLAY; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 161 "engines/director/lingo/lingo-lex.l"
+#line 163 "engines/director/lingo/lingo-lex.l"
{ count(); return tPLAY; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 162 "engines/director/lingo/lingo-lex.l"
+#line 164 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(yytext); return tPLAYACCEL; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 163 "engines/director/lingo/lingo-lex.l"
+#line 165 "engines/director/lingo/lingo-lex.l"
{ count(); return tPREVIOUS; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 164 "engines/director/lingo/lingo-lex.l"
+#line 166 "engines/director/lingo/lingo-lex.l"
{ count(); return tPROPERTY; } // D4
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 165 "engines/director/lingo/lingo-lex.l"
+#line 167 "engines/director/lingo/lingo-lex.l"
{ count(); return tPUT; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 166 "engines/director/lingo/lingo-lex.l"
+#line 168 "engines/director/lingo/lingo-lex.l"
{ count(); return checkImmediate(tREPEAT); }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 167 "engines/director/lingo/lingo-lex.l"
+#line 169 "engines/director/lingo/lingo-lex.l"
{ count(); return tSET; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 168 "engines/director/lingo/lingo-lex.l"
+#line 170 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1428,17 +1430,17 @@ YY_RULE_SETUP
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 185 "engines/director/lingo/lingo-lex.l"
+#line 187 "engines/director/lingo/lingo-lex.l"
{ count(); return tSTARTS; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 186 "engines/director/lingo/lingo-lex.l"
+#line 188 "engines/director/lingo/lingo-lex.l"
{ count(); return tTELL; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 187 "engines/director/lingo/lingo-lex.l"
+#line 189 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1450,7 +1452,7 @@ YY_RULE_SETUP
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 195 "engines/director/lingo/lingo-lex.l"
+#line 197 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1461,7 +1463,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 202 "engines/director/lingo/lingo-lex.l"
+#line 204 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1500,7 +1502,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 237 "engines/director/lingo/lingo-lex.l"
+#line 239 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1526,7 +1528,7 @@ YY_RULE_SETUP
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 259 "engines/director/lingo/lingo-lex.l"
+#line 261 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1593,7 +1595,7 @@ YY_RULE_SETUP
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 322 "engines/director/lingo/lingo-lex.l"
+#line 324 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1631,7 +1633,7 @@ YY_RULE_SETUP
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 356 "engines/director/lingo/lingo-lex.l"
+#line 358 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1654,72 +1656,72 @@ YY_RULE_SETUP
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 375 "engines/director/lingo/lingo-lex.l"
+#line 377 "engines/director/lingo/lingo-lex.l"
{ count(); return tTHEN; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 376 "engines/director/lingo/lingo-lex.l"
+#line 378 "engines/director/lingo/lingo-lex.l"
{ count(); return tTO; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 377 "engines/director/lingo/lingo-lex.l"
+#line 379 "engines/director/lingo/lingo-lex.l"
{ count(); return tSPRITE; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 378 "engines/director/lingo/lingo-lex.l"
+#line 380 "engines/director/lingo/lingo-lex.l"
{ count(); return tWITH; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 379 "engines/director/lingo/lingo-lex.l"
+#line 381 "engines/director/lingo/lingo-lex.l"
{ count(); return tWITHIN; }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 380 "engines/director/lingo/lingo-lex.l"
+#line 382 "engines/director/lingo/lingo-lex.l"
{ count(); return tWHEN; }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 381 "engines/director/lingo/lingo-lex.l"
+#line 383 "engines/director/lingo/lingo-lex.l"
{ count(); return tWHILE; }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 382 "engines/director/lingo/lingo-lex.l"
+#line 384 "engines/director/lingo/lingo-lex.l"
{ count(); return tWORD; }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 384 "engines/director/lingo/lingo-lex.l"
+#line 386 "engines/director/lingo/lingo-lex.l"
{ count(); return tNEQ; }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 385 "engines/director/lingo/lingo-lex.l"
+#line 387 "engines/director/lingo/lingo-lex.l"
{ count(); return tGE; }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 386 "engines/director/lingo/lingo-lex.l"
+#line 388 "engines/director/lingo/lingo-lex.l"
{ count(); return tLE; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 387 "engines/director/lingo/lingo-lex.l"
+#line 389 "engines/director/lingo/lingo-lex.l"
{ count(); return tCONCAT; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 388 "engines/director/lingo/lingo-lex.l"
+#line 390 "engines/director/lingo/lingo-lex.l"
{ count(); return tEQ; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 390 "engines/director/lingo/lingo-lex.l"
+#line 392 "engines/director/lingo/lingo-lex.l"
{
count();
yylval.s = new Common::String(yytext);
@@ -1757,41 +1759,41 @@ YY_RULE_SETUP
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 424 "engines/director/lingo/lingo-lex.l"
+#line 426 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 425 "engines/director/lingo/lingo-lex.l"
+#line 427 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 426 "engines/director/lingo/lingo-lex.l"
+#line 428 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 75:
/* rule 75 can match eol */
YY_RULE_SETUP
-#line 427 "engines/director/lingo/lingo-lex.l"
+#line 429 "engines/director/lingo/lingo-lex.l"
{ count(); return '\n'; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 428 "engines/director/lingo/lingo-lex.l"
+#line 430 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 429 "engines/director/lingo/lingo-lex.l"
+#line 431 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 431 "engines/director/lingo/lingo-lex.l"
+#line 433 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1795 "engines/director/lingo/lingo-lex.cpp"
+#line 1797 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2751,7 +2753,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 431 "engines/director/lingo/lingo-lex.l"
+#line 433 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 06c9eb1..7f0715a 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -40,6 +40,8 @@
#include "director/lingo/lingo-gr.h"
#include "director/lingo/lingo-the.h"
+#define register
+
using namespace Director;
int yyparse();
Commit: 118f0d26bd527484ea64c4e83d509838aae1bb98
https://github.com/scummvm/scummvm/commit/118f0d26bd527484ea64c4e83d509838aae1bb98
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:34:45+01:00
Commit Message:
GLK: Add override keywords
Changed paths:
engines/glk/detection.h
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 2e1a8c5..552257c 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -37,24 +37,24 @@ private:
public:
GlkMetaEngine() : MetaEngine() {}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Glk";
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "glk";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Infocom games (C) Infocom\nScott Adams games (C) Scott Adams";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
/**
* Returns a list of games supported by this engine.
Commit: 0595e9ba4a28be7d2f22d286f77e3113bbd8e6bd
https://github.com/scummvm/scummvm/commit/0595e9ba4a28be7d2f22d286f77e3113bbd8e6bd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:35:09+01:00
Commit Message:
JANITORIAL: Whitespace fixes
Changed paths:
engines/glk/detection.h
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 552257c..f0dcb3b 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -41,9 +41,9 @@ public:
return "Glk";
}
- const char *getEngineId() const override {
- return "glk";
- }
+ const char *getEngineId() const override {
+ return "glk";
+ }
virtual const char *getOriginalCopyright() const override {
return "Infocom games (C) Infocom\nScott Adams games (C) Scott Adams";
Commit: cad4b06dd972e8997b5b27d6129eb8374c43707e
https://github.com/scummvm/scummvm/commit/cad4b06dd972e8997b5b27d6129eb8374c43707e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:41:31+01:00
Commit Message:
GLK: More override keywords
Changed paths:
engines/glk/adrift/adrift.h
engines/glk/alan2/alan2.h
engines/glk/alan3/alan3.h
engines/glk/frotz/frotz.h
engines/glk/frotz/processor.h
engines/glk/glk.h
engines/glk/glulxe/glulxe.h
engines/glk/hugo/hugo.h
engines/glk/level9/level9.h
engines/glk/magnetic/magnetic.h
engines/glk/window_text_grid.h
diff --git a/engines/glk/adrift/adrift.h b/engines/glk/adrift/adrift.h
index ac082cb..bc003dc 100644
--- a/engines/glk/adrift/adrift.h
+++ b/engines/glk/adrift/adrift.h
@@ -50,7 +50,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/alan2/alan2.h b/engines/glk/alan2/alan2.h
index 7dc0fc5..e171c5f 100644
--- a/engines/glk/alan2/alan2.h
+++ b/engines/glk/alan2/alan2.h
@@ -68,7 +68,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Flag for the game to restart
diff --git a/engines/glk/alan3/alan3.h b/engines/glk/alan3/alan3.h
index cdaecde..24382c2 100644
--- a/engines/glk/alan3/alan3.h
+++ b/engines/glk/alan3/alan3.h
@@ -55,7 +55,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/frotz/frotz.h b/engines/glk/frotz/frotz.h
index a8083a3..764e9e0 100644
--- a/engines/glk/frotz/frotz.h
+++ b/engines/glk/frotz/frotz.h
@@ -39,7 +39,7 @@ protected:
/**
* Setup the video mode
*/
- virtual void initGraphicsMode();
+ virtual void initGraphicsMode() override;
/**
* Create the screen class
diff --git a/engines/glk/frotz/processor.h b/engines/glk/frotz/processor.h
index dddcc76..d3a14e7 100644
--- a/engines/glk/frotz/processor.h
+++ b/engines/glk/frotz/processor.h
@@ -204,7 +204,7 @@ protected:
* it according to err_report_mode.
* @param errNum Numeric code for error (1 to ERR_NUM_ERRORS)
*/
- void runtimeError(ErrorCode errNum);
+ void runtimeError(ErrorCode errNum) override;
/**@}*/
@@ -1027,7 +1027,7 @@ protected:
* \defgroup Object Opcode methods
* @{
*/
-
+
/**
* Branch if the first object is inside the second.
*
@@ -1087,7 +1087,7 @@ protected:
* zargs[0] = object
*/
void z_get_sibling();
-
+
/**
* Make an object the first child of another object.
*
diff --git a/engines/glk/glk.h b/engines/glk/glk.h
index 8daa7ce..7836115 100644
--- a/engines/glk/glk.h
+++ b/engines/glk/glk.h
@@ -83,7 +83,7 @@ protected:
bool _quitFlag;
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
/**
* Returns true whether a given feature is supported by the engine
diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 22076e2..4630eba 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -401,7 +401,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h
index dd284e3..14b3936 100644
--- a/engines/glk/hugo/hugo.h
+++ b/engines/glk/hugo/hugo.h
@@ -790,7 +790,7 @@ private:
* 5. If all is well, return to match the objects that were previously skipped over,
* loading them into objlist[]. Once again, this is done by MatchObject().
*
- * (The reason the objects are initially skipped is because it may be necessary to know
+ * (The reason the objects are initially skipped is because it may be necessary to know
* where to look for them--this may require knowing what the xobject is, if the syntax
* is something like:
*
@@ -947,7 +947,7 @@ private:
/**
* This is the main loop for running each line of code in sequence;
* the main switch statement is based on the first token in each line.
- *
+ *
* This routine is relatively complex, especially given the addition of debugger control.
* Basically it is structured like this:
*
@@ -1161,7 +1161,7 @@ private:
void SwitchtoDebugger() {}
void Debugger() {}
-
+
void UpdateDebugScreen() {}
void SwitchtoGame() {}
@@ -1185,7 +1185,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/level9/level9.h b/engines/glk/level9/level9.h
index 53085c7..3977c52 100644
--- a/engines/glk/level9/level9.h
+++ b/engines/glk/level9/level9.h
@@ -59,7 +59,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/magnetic/magnetic.h b/engines/glk/magnetic/magnetic.h
index c19ef9c..ece414e 100644
--- a/engines/glk/magnetic/magnetic.h
+++ b/engines/glk/magnetic/magnetic.h
@@ -1374,7 +1374,7 @@ public:
/**
* Run the game
*/
- void runGame();
+ void runGame() override;
/**
* Returns the running interpreter type
diff --git a/engines/glk/window_text_grid.h b/engines/glk/window_text_grid.h
index c9c4b03..d875c2d 100644
--- a/engines/glk/window_text_grid.h
+++ b/engines/glk/window_text_grid.h
@@ -98,7 +98,7 @@ public:
/**
* Set the size of a window
*/
- virtual void setSize(const Point &newSize) {
+ virtual void setSize(const Point &newSize) override {
Window::setSize(newSize);
_curX = CLIP((int16)_curX, _bbox.left, _bbox.right);
_curY = CLIP((int16)_curY, _bbox.top, _bbox.bottom);
@@ -107,7 +107,7 @@ public:
/**
* Sets the position of a window
*/
- virtual void setPosition(const Point &newPos) {
+ virtual void setPosition(const Point &newPos) override {
_bbox.moveTo(newPos);
_curX = CLIP((int16)_curX, _bbox.left, _bbox.right);
_curY = CLIP((int16)_curY, _bbox.top, _bbox.bottom);
Commit: aa5add6a72c08b40304f0cd17f0f3180b175d4b1
https://github.com/scummvm/scummvm/commit/aa5add6a72c08b40304f0cd17f0f3180b175d4b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:42:12+01:00
Commit Message:
GLK: Remove obsolete keyword
Changed paths:
engines/glk/jacl/jacl_main.cpp
diff --git a/engines/glk/jacl/jacl_main.cpp b/engines/glk/jacl/jacl_main.cpp
index 1b6b34b..ee42aa8 100644
--- a/engines/glk/jacl/jacl_main.cpp
+++ b/engines/glk/jacl/jacl_main.cpp
@@ -1243,7 +1243,7 @@ int restore_interaction() {
glui32 glk_get_bin_line_stream(strid_t file_stream, char *buffer, glui32 max_length) {
int character = 0;
- register int index = 0;
+ int index = 0;
character = g_vm->glk_get_char_stream(file_stream);
while (character != -1 && index < (int) max_length) {
Commit: e8c5c8dcea4b521f566c47507bcc1ec1ecadf3b6
https://github.com/scummvm/scummvm/commit/e8c5c8dcea4b521f566c47507bcc1ec1ecadf3b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:46:33+01:00
Commit Message:
GLK: Marked problematic spots and fixed couple of obvious bugs
Changed paths:
engines/glk/archetype/heap_sort.cpp
engines/glk/archetype/id_table.cpp
engines/glk/magnetic/magnetic.cpp
engines/glk/quest/geas_file.cpp
engines/glk/quest/read_file.cpp
diff --git a/engines/glk/archetype/heap_sort.cpp b/engines/glk/archetype/heap_sort.cpp
index 2f0edd2..91ff33a 100644
--- a/engines/glk/archetype/heap_sort.cpp
+++ b/engines/glk/archetype/heap_sort.cpp
@@ -30,6 +30,7 @@ namespace Archetype {
const char *const CANT_PEEK = "Internal error: cannot peek into heap";
const char *const CANT_POKE = "Internal error: cannot poke into heap";
+// FIXME: This requires global constructor
HeapType H;
void heap_sort_init() {
@@ -51,10 +52,10 @@ static void heapup() {
parent = L / 2;
else
parent = (L - 1) / 2;
-
+
if (!(access_xarray(H, L, Lp, PEEK_ACCESS) && access_xarray(H, parent, parentp, PEEK_ACCESS)))
g_vm->writeln(CANT_PEEK);
-
+
if (lighter(Lp, parentp)) {
temp = parentp;
if (!(access_xarray(H, parent, Lp, POKE_ACCESS) && access_xarray(H, L, temp, POKE_ACCESS)))
@@ -82,7 +83,7 @@ static void heapdown() {
rc = lc + 1;
if (!access_xarray(H, lc, lcp, PEEK_ACCESS))
g_vm->writeln(CANT_PEEK);
-
+
if (rc > H.size()) {
compare = lc;
comparep = lcp;
@@ -97,7 +98,7 @@ static void heapdown() {
comparep = rcp;
}
}
-
+
if (!access_xarray(H, L, lp, PEEK_ACCESS))
g_vm->writeln(CANT_PEEK);
if (!lighter(comparep, lp)) {
@@ -121,7 +122,7 @@ bool pop_heap(Element &e) {
if (!(access_xarray(H, 0, e, PEEK_ACCESS) && access_xarray(H, H.size() - 1, temp, PEEK_ACCESS)
&& access_xarray(H, 0, temp, POKE_ACCESS)))
g_vm->writeln(CANT_PEEK);
-
+
shrink_xarray(H);
heapdown();
return true;
diff --git a/engines/glk/archetype/id_table.cpp b/engines/glk/archetype/id_table.cpp
index 5bae511..0b11607 100644
--- a/engines/glk/archetype/id_table.cpp
+++ b/engines/glk/archetype/id_table.cpp
@@ -30,6 +30,7 @@ ClassifyType DefaultClassification;
// Static variables
IdRecPtr hash[BUCKETS];
+// FIXME: This requires global constructor
XArrayType h_index;
int add_ident(const String &id_str) {
@@ -39,7 +40,7 @@ int add_ident(const String &id_str) {
hasher = (int)(toupper(id_str[1])) - 65; // A..Z => 65..90 => 0..25
if (hasher < 0 || hasher > 25)
hasher = 26;
-
+
p = hash[hasher];
while (p->next && *p->next->id_name < id_str)
p = p->next;
@@ -47,7 +48,7 @@ int add_ident(const String &id_str) {
if (p->next == nullptr || *p->next->id_name > id_str) {
new_rec = new IdRecType();
append_to_xarray(h_index, new_rec);
-
+
new_rec->id_kind = DefaultClassification;
new_rec->id_index = h_index.size();
new_rec->id_integer = new_rec->id_index;
diff --git a/engines/glk/magnetic/magnetic.cpp b/engines/glk/magnetic/magnetic.cpp
index 9e909bc..4ddeec0 100644
--- a/engines/glk/magnetic/magnetic.cpp
+++ b/engines/glk/magnetic/magnetic.cpp
@@ -74,7 +74,7 @@ Magnetic::Magnetic(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(s
Common::fill(&dreg[0], &dreg[8], 0);
Common::fill(&areg[0], &areg[8], 0);
Common::fill(&tmparg[0], &tmparg[4], 0);
- Common::fill(&undo_regs[0][0], &undo_regs[3][0], 0);
+ Common::fill(&undo_regs[0][0], &undo_regs[2][0], 0);
undo[0] = undo[1] = nullptr;
undo_stat[0] = undo_stat[1] = 0;
Common::fill(&buffer[0], &buffer[80], 0);
diff --git a/engines/glk/quest/geas_file.cpp b/engines/glk/quest/geas_file.cpp
index 5bd0d55..bdca195 100644
--- a/engines/glk/quest/geas_file.cpp
+++ b/engines/glk/quest/geas_file.cpp
@@ -33,8 +33,10 @@ namespace Quest {
void report_error(const String &s);
+// FIXME: This requires global constructor
reserved_words obj_tag_property("look", "examine", "speak", "take", "alias", "prefix", "suffix", "detail", "displaytype", "gender", "article", "hidden", "invisible", (char *) NULL);
+// FIXME: This requires global constructor
reserved_words room_tag_property("look", "alias", "prefix", "indescription", "description", "north", "south", "east", "west", "northwest", "northeast", "southeast", "southwest", "up", "down", "out", (char *) NULL);
void GeasFile::debug_print(String s) const {
diff --git a/engines/glk/quest/read_file.cpp b/engines/glk/quest/read_file.cpp
index fb93015..2ceda40 100644
--- a/engines/glk/quest/read_file.cpp
+++ b/engines/glk/quest/read_file.cpp
@@ -132,6 +132,7 @@ bool is_end_define(String s) {
extern Common::Array<String> split_lines(String data);
+// FIXME: This requires global constructor
reserved_words dir_tag_property("north", "south", "east", "west", "northwest", "northeast", "southeast", "southwest", "up", "down", "out", (char *) NULL);
void GeasFile::read_into(const Common::Array<String> &in_data,
@@ -433,11 +434,7 @@ Common::WriteStream &operator<<(Common::WriteStream &o, const GeasFile &gf) {
return o;
}
-
-
-
-
-String compilation_tokens[256] = {
+const char *compilation_tokens[256] = {
"", "game", "procedure", "room", "object", "character", "text", "selection",
"define", "end", "", "asl-version", "game", "version", "author", "copyright",
"info", "start", "possitems", "startitems", "prefix", "look", "out", "gender",
Commit: ec9dd9811439873fc2edd0b18e9ed9352a870def
https://github.com/scummvm/scummvm/commit/ec9dd9811439873fc2edd0b18e9ed9352a870def
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:48:26+01:00
Commit Message:
GOB: Added override keywords
Changed paths:
engines/gob/detection/detection.cpp
diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp
index c56ed45..28964d6 100644
--- a/engines/gob/detection/detection.cpp
+++ b/engines/gob/detection/detection.cpp
@@ -32,19 +32,19 @@ class GobMetaEngine : public AdvancedMetaEngine {
public:
GobMetaEngine();
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "gob";
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
- virtual const char *getName() const;
- virtual const char *getOriginalCopyright() const;
+ virtual const char *getName() const override;
+ virtual const char *getOriginalCopyright() const override;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
private:
/**
Commit: 299de83188c5a3da8995981ac19517c59e2acd75
https://github.com/scummvm/scummvm/commit/299de83188c5a3da8995981ac19517c59e2acd75
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:52:17+01:00
Commit Message:
KYRA: Added override keywords
Changed paths:
engines/kyra/detection.cpp
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 91e791d..f27f869 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -157,15 +157,15 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "kyra";
}
- const char *getName() const {
+ const char *getName() const override {
return "Kyra";
}
- const char *getOriginalCopyright() const {
+ const char *getOriginalCopyright() const override {
return "The Legend of Kyrandia (C) Westwood Studios"
#ifdef ENABLE_LOL
"\nLands of Lore (C) Westwood Studios"
@@ -176,12 +176,12 @@ public:
;
}
- bool hasFeature(MetaEngineFeature f) const;
- bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ bool hasFeature(MetaEngineFeature f) const override;
+ bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
Common::KeymapArray initKeymaps(const char *target) const override;
};
Commit: f9c0d1c827f1846f07c3a77d3ac6eca5c077747a
https://github.com/scummvm/scummvm/commit/f9c0d1c827f1846f07c3a77d3ac6eca5c077747a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:55:49+01:00
Commit Message:
MACVENTURE: Added override keywords
Changed paths:
engines/macventure/detection.cpp
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index d258ea0..1a36953 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -76,12 +76,12 @@ public:
}
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;
+ bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ bool hasFeature(MetaEngineFeature f) 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;
};
bool MacVentureMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 567ca7f40243eaaff26b191c961eb6bfa9468a3c
https://github.com/scummvm/scummvm/commit/567ca7f40243eaaff26b191c961eb6bfa9468a3c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:56:51+01:00
Commit Message:
MADE: Added detection keywords
Changed paths:
engines/made/detection.cpp
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index f4f46f3..a41f132 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -58,20 +58,20 @@ public:
MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "made";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "MADE";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "MADE Engine (C) Activision";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
Commit: fa8afb37a8db5f7cc8405c07435ee63f5a741146
https://github.com/scummvm/scummvm/commit/fa8afb37a8db5f7cc8405c07435ee63f5a741146
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T13:57:55+01:00
Commit Message:
MOHAWK: Added missing override keyword
Changed paths:
engines/mohawk/detection.cpp
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 6d749f5..80e7bf2 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -207,7 +207,7 @@ public:
return detectGameFilebased(allFiles, fslist, Mohawk::fileBased);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "mohawk";
}
Commit: 02aec5976d40e61cae779c58cf25d183282abd26
https://github.com/scummvm/scummvm/commit/02aec5976d40e61cae779c58cf25d183282abd26
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:02:11+01:00
Commit Message:
MUTATIONOFJB: Added override commands
Changed paths:
engines/mutationofjb/commands/camefromcommand.h
engines/mutationofjb/commands/changecommand.h
engines/mutationofjb/commands/conditionalcommand.h
engines/mutationofjb/commands/endblockcommand.h
engines/mutationofjb/commands/ifcommand.h
engines/mutationofjb/commands/ifitemcommand.h
engines/mutationofjb/commands/ifpiggycommand.h
engines/mutationofjb/detection.cpp
engines/mutationofjb/mutationofjb.h
diff --git a/engines/mutationofjb/commands/camefromcommand.h b/engines/mutationofjb/commands/camefromcommand.h
index c4048cb..c2e971d 100644
--- a/engines/mutationofjb/commands/camefromcommand.h
+++ b/engines/mutationofjb/commands/camefromcommand.h
@@ -38,7 +38,7 @@ class CameFromCommand : public ConditionalCommand {
public:
CameFromCommand(uint8 sceneId) : _sceneId(sceneId) {}
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
private:
uint8 _sceneId;
};
@@ -46,4 +46,3 @@ private:
}
#endif
-
diff --git a/engines/mutationofjb/commands/changecommand.h b/engines/mutationofjb/commands/changecommand.h
index a88cdc1..cb3a9b7 100644
--- a/engines/mutationofjb/commands/changecommand.h
+++ b/engines/mutationofjb/commands/changecommand.h
@@ -114,7 +114,7 @@ public:
: ChangeCommand(sceneId, doorId, reg, op, val)
{}
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
};
class ChangeObjectCommand : public ChangeCommand {
@@ -123,7 +123,7 @@ public:
: ChangeCommand(sceneId, objectId, reg, op, val)
{}
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
};
class ChangeStaticCommand : public ChangeCommand {
@@ -132,7 +132,7 @@ public:
: ChangeCommand(sceneId, staticId, reg, op, val)
{}
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
};
class ChangeSceneCommand : public ChangeCommand {
@@ -141,7 +141,7 @@ public:
: ChangeCommand(sceneId, staticId, reg, op, val)
{}
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
};
}
diff --git a/engines/mutationofjb/commands/conditionalcommand.h b/engines/mutationofjb/commands/conditionalcommand.h
index 1ca29b6..dff33da 100644
--- a/engines/mutationofjb/commands/conditionalcommand.h
+++ b/engines/mutationofjb/commands/conditionalcommand.h
@@ -32,7 +32,7 @@ namespace MutationOfJB {
class ConditionalCommandParser : public CommandParser {
public:
ConditionalCommandParser(bool firstHash = false) : _firstHash(firstHash) {}
- virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser);
+ virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override;
virtual void finish(ScriptParseContext &parseCtx) override;
protected:
Common::Queue<char> _tags;
diff --git a/engines/mutationofjb/commands/endblockcommand.h b/engines/mutationofjb/commands/endblockcommand.h
index bda50fb..b9ac15c 100644
--- a/engines/mutationofjb/commands/endblockcommand.h
+++ b/engines/mutationofjb/commands/endblockcommand.h
@@ -66,7 +66,7 @@ public:
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
virtual Command *next() const override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
private:
Command *_nextCmd;
};
diff --git a/engines/mutationofjb/commands/ifcommand.h b/engines/mutationofjb/commands/ifcommand.h
index 04174d9..c0d93d7 100644
--- a/engines/mutationofjb/commands/ifcommand.h
+++ b/engines/mutationofjb/commands/ifcommand.h
@@ -41,7 +41,7 @@ public:
IfCommand(uint8 sceneId, uint8 objectId, uint16 value, bool negative);
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
private:
uint8 _sceneId;
diff --git a/engines/mutationofjb/commands/ifitemcommand.h b/engines/mutationofjb/commands/ifitemcommand.h
index 86a5ad2..77cdf0b 100644
--- a/engines/mutationofjb/commands/ifitemcommand.h
+++ b/engines/mutationofjb/commands/ifitemcommand.h
@@ -41,7 +41,7 @@ public:
IfItemCommand(const Common::String &item, bool negative);
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
private:
Common::String _item;
diff --git a/engines/mutationofjb/commands/ifpiggycommand.h b/engines/mutationofjb/commands/ifpiggycommand.h
index d10788c..d1db4c9 100644
--- a/engines/mutationofjb/commands/ifpiggycommand.h
+++ b/engines/mutationofjb/commands/ifpiggycommand.h
@@ -39,7 +39,7 @@ public:
class IfPiggyCommand : public ConditionalCommand {
public:
virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override;
- virtual Common::String debugString() const;
+ virtual Common::String debugString() const override;
private:
};
diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp
index 7dd523b..1fe21ba 100644
--- a/engines/mutationofjb/detection.cpp
+++ b/engines/mutationofjb/detection.cpp
@@ -92,7 +92,7 @@ public:
_directoryGlobs = mutationofjbDirectoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "mutationofjb";
}
diff --git a/engines/mutationofjb/mutationofjb.h b/engines/mutationofjb/mutationofjb.h
index a499769..64e52aa 100644
--- a/engines/mutationofjb/mutationofjb.h
+++ b/engines/mutationofjb/mutationofjb.h
@@ -60,7 +60,7 @@ public:
MutationOfJBEngine(OSystem *syst, const ADGameDescription *gameDesc);
~MutationOfJBEngine();
- virtual Common::Error run();
+ virtual Common::Error run() override;
Graphics::Screen *getScreen() const;
Game &getGame();
void setCursorState(CursorState cursorState);
Commit: 4187038c625dd049e5887eb7dc15801eddbe24cf
https://github.com/scummvm/scummvm/commit/4187038c625dd049e5887eb7dc15801eddbe24cf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:03:58+01:00
Commit Message:
PEGASUS: Added override keywords
Changed paths:
engines/pegasus/detection.cpp
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index 3263781..5f52d72 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -136,23 +136,23 @@ public:
PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) {
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "pegasus";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "The Journeyman Project: Pegasus Prime";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "The Journeyman Project: Pegasus Prime (C) Presto Studios";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const { return 999; }
- virtual void removeSaveState(const char *target, int slot) const;
+ 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;
Common::KeymapArray initKeymaps(const char *target) const override;
};
Commit: eae52773dd5e898cd4fee3cd0e0ec017e8b94f23
https://github.com/scummvm/scummvm/commit/eae52773dd5e898cd4fee3cd0e0ec017e8b94f23
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:07:05+01:00
Commit Message:
PINK: Added override keywords
Changed paths:
engines/pink/cel_decoder.h
engines/pink/objects/actors/audio_info_pda_button.h
engines/pink/objects/actors/lead_actor.h
engines/pink/objects/walk/walk_location.h
engines/pink/objects/walk/walk_mgr.h
diff --git a/engines/pink/cel_decoder.h b/engines/pink/cel_decoder.h
index 36f8dc2..2c89790 100644
--- a/engines/pink/cel_decoder.h
+++ b/engines/pink/cel_decoder.h
@@ -43,7 +43,7 @@ protected:
class CelVideoTrack : public FlicVideoTrack {
public:
CelVideoTrack(Common::SeekableReadStream *stream, uint16 frameCount, uint16 width, uint16 height, bool skipHeader = false);
- virtual void readHeader();
+ virtual void readHeader() override;
uint16 getTransparentColourIndex();
@@ -59,7 +59,7 @@ protected:
bool rewind() override;
private:
- const Graphics::Surface *decodeNextFrame();
+ const Graphics::Surface *decodeNextFrame() override;
void readPrefixChunk();
Common::Point _center;
diff --git a/engines/pink/objects/actors/audio_info_pda_button.h b/engines/pink/objects/actors/audio_info_pda_button.h
index c2949e2..2363a89 100644
--- a/engines/pink/objects/actors/audio_info_pda_button.h
+++ b/engines/pink/objects/actors/audio_info_pda_button.h
@@ -34,9 +34,9 @@ namespace Pink {
class AudioInfoPDAButton : public Actor {
public:
- void toConsole();
+ void toConsole() override;
- void onMouseOver(const Common::Point point, CursorMgr *mgr);
+ void onMouseOver(const Common::Point point, CursorMgr *mgr) override;
void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, CursorMgr *cursorMgr) override;
void onLeftClickMessage() override;
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index b041f4f..f561d49 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -60,7 +60,7 @@ public:
void loadState(Archive &archive);
void saveState(Archive &archive);
- virtual void init(bool paused);
+ virtual void init(bool paused) override;
void start(bool isHandler);
diff --git a/engines/pink/objects/walk/walk_location.h b/engines/pink/objects/walk/walk_location.h
index 1f77584..9c02479 100644
--- a/engines/pink/objects/walk/walk_location.h
+++ b/engines/pink/objects/walk/walk_location.h
@@ -28,7 +28,7 @@ namespace Pink {
class WalkLocation : public NamedObject {
public:
- virtual void deserialize(Archive &archive);
+ virtual void deserialize(Archive &archive) override;
void toConsole() override;
Common::StringArray &getNeigbors() { return _neighbors;}
diff --git a/engines/pink/objects/walk/walk_mgr.h b/engines/pink/objects/walk/walk_mgr.h
index 07b0beb..5fa6c0f 100644
--- a/engines/pink/objects/walk/walk_mgr.h
+++ b/engines/pink/objects/walk/walk_mgr.h
@@ -44,7 +44,7 @@ class WalkMgr : public Object {
public:
WalkMgr();
~WalkMgr() override;
- virtual void deserialize(Archive &archive);
+ virtual void deserialize(Archive &archive) override;
void toConsole() override;
WalkLocation *findLocation(const Common::String &name);
Commit: 7e43cad1bcc2094e345e6e3fa5a06ff9d31e0ea7
https://github.com/scummvm/scummvm/commit/7e43cad1bcc2094e345e6e3fa5a06ff9d31e0ea7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:13:13+01:00
Commit Message:
QUEEN: Added override keywords
Changed paths:
engines/queen/detection.cpp
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index ed7dd7b..228499d 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -484,23 +484,23 @@ public:
QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "queen";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Flight of the Amazon Queen";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Flight of the Amazon Queen (C) John Passfield and Steve Stamatiadis";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const { return 99; }
- virtual void removeSaveState(const char *target, int slot) const;
+ 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 99; }
+ virtual void removeSaveState(const char *target, int slot) const override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
};
Commit: a4821672caad47f7b8ab4d436e24e36d094abc62
https://github.com/scummvm/scummvm/commit/a4821672caad47f7b8ab4d436e24e36d094abc62
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:15:36+01:00
Commit Message:
SCI: Added override keywords
Changed paths:
engines/sci/detection.cpp
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 422c32a..3b0a708 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -563,11 +563,11 @@ public:
_matchFullPaths = true;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "sci";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "SCI ["
#ifdef ENABLE_SCI32
"all games"
@@ -577,17 +577,17 @@ public:
"]";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Sierra's Creative Interpreter (C) Sierra Online";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
- 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;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool hasFeature(MetaEngineFeature f) 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;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
Common::Language charToScummVMLanguage(const char c) {
Commit: 0fa8986a2957a52a46bdc784cae3a837fcd5ecf0
https://github.com/scummvm/scummvm/commit/0fa8986a2957a52a46bdc784cae3a837fcd5ecf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:21:53+01:00
Commit Message:
SHERLOCK: Fix clashing enums
Changed paths:
engines/sherlock/scalpel/scalpel_journal.cpp
engines/sherlock/scalpel/scalpel_journal.h
diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp
index 151d986..026787d 100644
--- a/engines/sherlock/scalpel/scalpel_journal.cpp
+++ b/engines/sherlock/scalpel/scalpel_journal.cpp
@@ -462,8 +462,6 @@ bool ScalpelJournal::handleEvents(int key) {
}
int ScalpelJournal::getSearchString(bool printError) {
- enum Button { BTN_NONE, BTN_EXIT, BTN_BACKWARD, BTN_FORWARD };
-
Events &events = *_vm->_events;
ScalpelScreen &screen = *(ScalpelScreen *)_vm->_screen;
Talk &talk = *_vm->_talk;
@@ -521,7 +519,7 @@ int ScalpelJournal::getSearchString(bool printError) {
do {
events._released = false;
- Button found = BTN_NONE;
+ JournalButton found = BTN_NONE;
while (!_vm->shouldQuit() && !events.kbHit() && !events._released) {
found = BTN_NONE;
diff --git a/engines/sherlock/scalpel/scalpel_journal.h b/engines/sherlock/scalpel/scalpel_journal.h
index 50f1917..2b04707 100644
--- a/engines/sherlock/scalpel/scalpel_journal.h
+++ b/engines/sherlock/scalpel/scalpel_journal.h
@@ -37,7 +37,7 @@ namespace Scalpel {
enum JournalButton {
BTN_NONE, BTN_EXIT, BTN_BACK10, BTN_UP, BTN_DOWN, BTN_AHEAD110, BTN_SEARCH,
- BTN_FIRST_PAGE, BTN_LAST_PAGE, BTN_PRINT_TEXT
+ BTN_FIRST_PAGE, BTN_LAST_PAGE, BTN_PRINT_TEXT, BTN_BACKWARD, BTN_FORWARD
};
class ScalpelJournal: public Journal {
Commit: 88ae01298ee9fc72ea6f9e19dedcbb97edd16347
https://github.com/scummvm/scummvm/commit/88ae01298ee9fc72ea6f9e19dedcbb97edd16347
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:23:41+01:00
Commit Message:
SKY: Added override keywords
Changed paths:
engines/sky/detection.cpp
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 9ce13a6..f513b2b 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -72,24 +72,24 @@ static const SkyVersion skyVersions[] = {
class SkyMetaEngine : public MetaEngine {
public:
- virtual const char *getName() const;
- virtual const char *getOriginalCopyright() const;
+ virtual const char *getName() const override;
+ virtual const char *getOriginalCopyright() const override;
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "sky";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
PlainGameList getSupportedGames() const override;
- virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
PlainGameDescriptor findGame(const char *gameid) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
const char *SkyMetaEngine::getName() const {
Commit: 50fcecbc57f2f25c770d2b66492efb3caa3ef31a
https://github.com/scummvm/scummvm/commit/50fcecbc57f2f25c770d2b66492efb3caa3ef31a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:24:36+01:00
Commit Message:
SLUDGE: Added override keywords
Changed paths:
engines/sludge/detection.cpp
diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp
index bd469c8..f64686a 100644
--- a/engines/sludge/detection.cpp
+++ b/engines/sludge/detection.cpp
@@ -82,19 +82,19 @@ public:
_maxScanDepth = 1;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "sludge";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Sludge";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Sludge (C) 2000-2014 Hungry Software and contributors";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override {
const Sludge::SludgeGameDescription *gd = (const Sludge::SludgeGameDescription *)desc;
if (gd) {
*engine = new Sludge::SludgeEngine(syst, gd);
Commit: 9801396f9f01d351ac3599730a40d65444156f6a
https://github.com/scummvm/scummvm/commit/9801396f9f01d351ac3599730a40d65444156f6a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:26:23+01:00
Commit Message:
SWORD1: Added override keywords
Changed paths:
engines/sword1/detection.cpp
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 2d39a2d..359b0d6 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -79,27 +79,27 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h
class SwordMetaEngine : public MetaEngine {
public:
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "sword1";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Broken Sword: The Shadow of the Templars";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Broken Sword: The Shadow of the Templars (C) Revolution";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
PlainGameList getSupportedGames() const override;
PlainGameDescriptor findGame(const char *gameId) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
};
bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: bd282d5aef68a7dbdce0679ef81a56492488e1bb
https://github.com/scummvm/scummvm/commit/bd282d5aef68a7dbdce0679ef81a56492488e1bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:27:51+01:00
Commit Message:
SWORD2: Added override keywords
Changed paths:
engines/sword2/sword2.cpp
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 2c682bc..e1d9254 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -84,27 +84,27 @@ static const ExtraGuiOption sword2ExtraGuiOption = {
class Sword2MetaEngine : public MetaEngine {
public:
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "sword2";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Broken Sword II: The Smoking Mirror";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Broken Sword II: The Smoking Mirror (C) Revolution";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
PlainGameList getSupportedGames() const override;
- virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
PlainGameDescriptor findGame(const char *gameid) const override;
- virtual DetectedGames detectGames(const Common::FSList &fslist) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual DetectedGames detectGames(const Common::FSList &fslist) 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;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
};
bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 556e2d72ce05581cd87e302aab119f30b117df46
https://github.com/scummvm/scummvm/commit/556e2d72ce05581cd87e302aab119f30b117df46
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:29:24+01:00
Commit Message:
TINSEL: Added override keywords
Changed paths:
engines/tinsel/detection.cpp
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 0516a47..1a9cc44 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -86,26 +86,26 @@ public:
TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override{
return "tinsel";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Tinsel";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Tinsel (C) Psygnosis";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override;
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 44ad78be9881663232434ffd7fa9e3745996728f
https://github.com/scummvm/scummvm/commit/44ad78be9881663232434ffd7fa9e3745996728f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:32:28+01:00
Commit Message:
TOON: Added override keywords
Changed paths:
engines/toon/detection.cpp
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 4fc6b06..ecd5831 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -145,24 +145,24 @@ public:
return detectGameFilebased(allFiles, fslist, Toon::fileBasedFallback);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "toon";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Toonstruck";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Toonstruck (C) 1996 Virgin Interactive";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual int getMaximumSaveSlot() const;
- virtual SaveStateList listSaves(const char *target) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ 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;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
bool ToonMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 7b3fbbdd95afbf82805fcc7bd00c714c3d56d6a4
https://github.com/scummvm/scummvm/commit/7b3fbbdd95afbf82805fcc7bd00c714c3d56d6a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:33:11+01:00
Commit Message:
TOUCHE: Added override keywords
Changed paths:
engines/touche/detection.cpp
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 08644cc..996fb73 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -136,23 +136,23 @@ public:
return detectGameFilebased(allFiles, fslist, Touche::fileBasedFallback);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "touche";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Touche: The Adventures of the Fifth Musketeer";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Touche: The Adventures of the Fifth Musketeer (C) Clipper Software";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
+ 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 ToucheMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 8118ce83754c112c0aee3c52567389192a90ecfa
https://github.com/scummvm/scummvm/commit/8118ce83754c112c0aee3c52567389192a90ecfa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:35:04+01:00
Commit Message:
TUCKER: Added override keywords
Changed paths:
engines/tucker/detection.cpp
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp
index 990c1ad..77c1324 100644
--- a/engines/tucker/detection.cpp
+++ b/engines/tucker/detection.cpp
@@ -127,19 +127,19 @@ public:
_md5Bytes = 512;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "tucker";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Bud Tucker in Double Trouble";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Bud Tucker in Double Trouble (C) Merit Studios";
}
- virtual bool hasFeature(MetaEngineFeature f) const {
+ virtual bool hasFeature(MetaEngineFeature f) const override {
switch (f) {
case kSupportsListSaves:
case kSupportsLoadingDuringStartup:
@@ -154,7 +154,7 @@ public:
}
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override {
if (desc) {
*engine = new Tucker::TuckerEngine(syst, desc->language, desc->flags);
}
@@ -176,7 +176,7 @@ public:
return ADDetectedGame();
}
- virtual SaveStateList listSaves(const char *target) const {
+ virtual SaveStateList listSaves(const char *target) const override {
Common::String pattern = Tucker::generateGameStateFileName(target, 0, true);
Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern);
Tucker::TuckerEngine::SavegameHeader header;
@@ -202,16 +202,16 @@ public:
return saveList;
}
- virtual int getMaximumSaveSlot() const {
+ virtual int getMaximumSaveSlot() const override {
return Tucker::kLastSaveSlot;
}
- virtual void removeSaveState(const char *target, int slot) const {
+ virtual void removeSaveState(const char *target, int slot) const override {
Common::String filename = Tucker::generateGameStateFileName(target, slot);
g_system->getSavefileManager()->removeSavefile(filename);
}
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const {
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override {
Common::String fileName = Common::String::format("%s.%d", target, slot);
Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName);
Commit: 5dd49de0b3796f7e95806556fe0244fb78da7434
https://github.com/scummvm/scummvm/commit/5dd49de0b3796f7e95806556fe0244fb78da7434
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:47:01+01:00
Commit Message:
SWORD25: Add override keywords
Changed paths:
engines/sword25/gfx/animationresource.h
diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h
index d4b5832..953cc88 100644
--- a/engines/sword25/gfx/animationresource.h
+++ b/engines/sword25/gfx/animationresource.h
@@ -48,13 +48,13 @@ public:
AnimationResource(const Common::String &filename);
virtual ~AnimationResource();
- virtual const Frame &getFrame(uint index) const {
+ virtual const Frame &getFrame(uint index) const override {
return _frames[index];
}
- virtual uint getFrameCount() const {
+ virtual uint getFrameCount() const override {
return _frames.size();
}
- virtual void unlock() {
+ virtual void unlock() override {
release();
}
Commit: 9c92773844ad53864e2d2ebc3f020019ec798e6c
https://github.com/scummvm/scummvm/commit/9c92773844ad53864e2d2ebc3f020019ec798e6c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:48:10+01:00
Commit Message:
COMMON: Add override keywords
Changed paths:
common/xmlparser.h
diff --git a/common/xmlparser.h b/common/xmlparser.h
index 2e4596a..dbd9d0e 100644
--- a/common/xmlparser.h
+++ b/common/xmlparser.h
@@ -64,12 +64,12 @@ class SeekableReadStream;
#define CUSTOM_XML_PARSER(parserName) \
protected: \
typedef parserName kLocalParserName; \
- bool keyCallback(ParserNode *node) {return node->layout->doCallback(this, node); }\
+ bool keyCallback(ParserNode *node) override {return node->layout->doCallback(this, node); }\
struct CustomXMLKeyLayout : public XMLKeyLayout {\
typedef bool (parserName::*ParserCallback)(ParserNode *node);\
ParserCallback callback;\
bool doCallback(XMLParser *parent, ParserNode *node) {return ((kLocalParserName *)parent->*callback)(node);} };\
- virtual void buildLayout() { \
+ virtual void buildLayout() override { \
Common::Stack<XMLKeyLayout *> layout; \
CustomXMLKeyLayout *lay = 0; \
XMLKeyLayout::XMLKeyProperty prop; \
Commit: b0fba6d0f3a2eaf472ba3a125614760fcefcc4f9
https://github.com/scummvm/scummvm/commit/b0fba6d0f3a2eaf472ba3a125614760fcefcc4f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T14:51:42+01:00
Commit Message:
GRAPHICS: Added override keywords
Changed paths:
graphics/VectorRendererSpec.h
diff --git a/graphics/VectorRendererSpec.h b/graphics/VectorRendererSpec.h
index e903451..9145d2b 100644
--- a/graphics/VectorRendererSpec.h
+++ b/graphics/VectorRendererSpec.h
@@ -50,14 +50,14 @@ class VectorRendererSpec : public VectorRenderer {
public:
VectorRendererSpec(PixelFormat format);
- void drawLine(int x1, int y1, int x2, int y2);
- void drawCircle(int x, int y, int r);
- void drawSquare(int x, int y, int w, int h);
- void drawRoundedSquare(int x, int y, int r, int w, int h);
- void drawTriangle(int x, int y, int base, int height, TriangleOrientation orient);
- void drawTab(int x, int y, int r, int w, int h);
-
- void drawBeveledSquare(int x, int y, int w, int h) {
+ void drawLine(int x1, int y1, int x2, int y2) override;
+ void drawCircle(int x, int y, int r) override;
+ void drawSquare(int x, int y, int w, int h) override;
+ void drawRoundedSquare(int x, int y, int r, int w, int h) override;
+ void drawTriangle(int x, int y, int base, int height, TriangleOrientation orient) override;
+ void drawTab(int x, int y, int r, int w, int h) override;
+
+ void drawBeveledSquare(int x, int y, int w, int h) override {
bool useClippingVersions = !_clippingArea.contains(Common::Rect(x, y, x + w, y + h));
if (useClippingVersions) {
drawBevelSquareAlgClip(x, y, w, h, _bevel, _bevelColor, _fgColor);
@@ -66,29 +66,29 @@ public:
}
}
void drawString(const Graphics::Font *font, const Common::String &text,
- const Common::Rect &area, Graphics::TextAlign alignH,
- GUI::ThemeEngine::TextAlignVertical alignV, int deltax, bool elipsis, const Common::Rect &textDrawableArea = Common::Rect(0, 0, 0, 0));
+ const Common::Rect &area, Graphics::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV,
+ int deltax, bool elipsis, const Common::Rect &textDrawableArea = Common::Rect(0, 0, 0, 0)) override;
- void setFgColor(uint8 r, uint8 g, uint8 b) { _fgColor = _format.RGBToColor(r, g, b); }
- void setBgColor(uint8 r, uint8 g, uint8 b) { _bgColor = _format.RGBToColor(r, g, b); }
- void setBevelColor(uint8 r, uint8 g, uint8 b) { _bevelColor = _format.RGBToColor(r, g, b); }
- void setGradientColors(uint8 r1, uint8 g1, uint8 b1, uint8 r2, uint8 g2, uint8 b2);
+ void setFgColor(uint8 r, uint8 g, uint8 b) override { _fgColor = _format.RGBToColor(r, g, b); }
+ void setBgColor(uint8 r, uint8 g, uint8 b) override { _bgColor = _format.RGBToColor(r, g, b); }
+ void setBevelColor(uint8 r, uint8 g, uint8 b) override { _bevelColor = _format.RGBToColor(r, g, b); }
+ void setGradientColors(uint8 r1, uint8 g1, uint8 b1, uint8 r2, uint8 g2, uint8 b2) override;
void setClippingRect(const Common::Rect &clippingArea) override { _clippingArea = clippingArea; }
- void copyFrame(OSystem *sys, const Common::Rect &r);
- void copyWholeFrame(OSystem *sys) { copyFrame(sys, Common::Rect(0, 0, _activeSurface->w, _activeSurface->h)); }
+ void copyFrame(OSystem *sys, const Common::Rect &r) override;
+ void copyWholeFrame(OSystem *sys) override { copyFrame(sys, Common::Rect(0, 0, _activeSurface->w, _activeSurface->h)); }
- void fillSurface();
- void blitSurface(const Graphics::Surface *source, const Common::Rect &r);
- void blitSubSurface(const Graphics::Surface *source, const Common::Point &p);
- void blitKeyBitmap(const Graphics::Surface *source, const Common::Point &p);
+ void fillSurface() override;
+ void blitSurface(const Graphics::Surface *source, const Common::Rect &r) override;
+ void blitSubSurface(const Graphics::Surface *source, const Common::Point &p) override;
+ void blitKeyBitmap(const Graphics::Surface *source, const Common::Point &p) override;
void blitAlphaBitmap(Graphics::TransparentSurface *source, const Common::Rect &r,
GUI::ThemeEngine::AutoScaleMode autoscale = GUI::ThemeEngine::kAutoScaleNone,
Graphics::DrawStep::VectorAlignment xAlign = Graphics::DrawStep::kVectorAlignManual,
Graphics::DrawStep::VectorAlignment yAlign = Graphics::DrawStep::kVectorAlignManual,
- int alpha = 255);
+ int alpha = 255) override;
- void applyScreenShading(GUI::ThemeEngine::ShadingStyle shadingStyle);
+ void applyScreenShading(GUI::ThemeEngine::ShadingStyle shadingStyle) override;
protected:
More information about the Scummvm-git-logs
mailing list