[Scummvm-git-logs] scummvm master -> 2e2a613e23cfd2826dd65c4fe36f51d1d42e5653
bluegr
noreply at scummvm.org
Sun Nov 14 12:34:19 UTC 2021
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fd4d6e3bc0 GRIM: Use override
8b10aa2cd8 HADESCH: Use override
e82ff2400a MYST3: Use override
c1343e8051 NANCY: Use override
fc95bf1eca PEGASUS: Use override
d6a4c4f83a SAGA2: Use override
2e2a613e23 STARK: Use override
Commit: fd4d6e3bc03a0f2dda625081c142eabf8e31be22
https://github.com/scummvm/scummvm/commit/fd4d6e3bc03a0f2dda625081c142eabf8e31be22
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
GRIM: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/grim/emi/sound/mp3track.cpp
engines/grim/lab.h
diff --git a/engines/grim/emi/sound/mp3track.cpp b/engines/grim/emi/sound/mp3track.cpp
index d544ba38ce..e9397344ce 100644
--- a/engines/grim/emi/sound/mp3track.cpp
+++ b/engines/grim/emi/sound/mp3track.cpp
@@ -53,7 +53,7 @@ public:
_done = true;
}
- int readBuffer(int16 *buffer, const int numSamples) {
+ int readBuffer(int16 *buffer, const int numSamples) override {
if (_done)
return 0;
@@ -84,10 +84,10 @@ public:
}
bool hasLooped() const { return _hasLooped; }
- bool endOfData() const { return _done; }
+ bool endOfData() const override { return _done; }
- bool isStereo() const { return _parent->isStereo(); }
- int getRate() const { return _parent->getRate(); }
+ bool isStereo() const override { return _parent->isStereo(); }
+ int getRate() const override { return _parent->getRate(); }
Audio::Timestamp getPos() const { return _pos; }
private:
diff --git a/engines/grim/lab.h b/engines/grim/lab.h
index 0dfcd22660..132b39d423 100644
--- a/engines/grim/lab.h
+++ b/engines/grim/lab.h
@@ -48,7 +48,7 @@ class Lab : public Common::Archive {
public:
bool open(const Common::String &filename, bool keepStream = false);
Lab();
- virtual ~Lab();
+ ~Lab();
// Common::Archive implementation
bool hasFile(const Common::Path &path) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
Commit: 8b10aa2cd8661b5a527d8c077555714d3dbdec13
https://github.com/scummvm/scummvm/commit/8b10aa2cd8661b5a527d8c077555714d3dbdec13
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
HADESCH: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/hadesch/rooms/monster/projectile.cpp
engines/hadesch/rooms/riverstyx.cpp
diff --git a/engines/hadesch/rooms/monster/projectile.cpp b/engines/hadesch/rooms/monster/projectile.cpp
index 3d83acf2e9..42b27b4720 100644
--- a/engines/hadesch/rooms/monster/projectile.cpp
+++ b/engines/hadesch/rooms/monster/projectile.cpp
@@ -236,7 +236,7 @@ void Battleground::stopProjectiles() {
class HandlerProjectile : public EventHandler {
public:
- void operator()() {
+ void operator()() override {
_projectile->handleEvent(_event);
}
diff --git a/engines/hadesch/rooms/riverstyx.cpp b/engines/hadesch/rooms/riverstyx.cpp
index 7843b7b67c..2fb6051991 100644
--- a/engines/hadesch/rooms/riverstyx.cpp
+++ b/engines/hadesch/rooms/riverstyx.cpp
@@ -58,7 +58,7 @@ public:
StyxShadeEndSound(Common::SharedPtr<StyxShadeInternal> internal) {
_internal = internal;
}
- void operator()() {
+ void operator()() override {
_internal->resume();
}
private:
Commit: e82ff2400a79893f3d2448b246c4108528c2af1b
https://github.com/scummvm/scummvm/commit/e82ff2400a79893f3d2448b246c4108528c2af1b
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
MYST3: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/myst3/database.cpp
diff --git a/engines/myst3/database.cpp b/engines/myst3/database.cpp
index 59542f0de0..220a01dfb2 100644
--- a/engines/myst3/database.cpp
+++ b/engines/myst3/database.cpp
@@ -50,8 +50,8 @@ class NodeTransformAddHotspots : public NodeTransform {
public :
NodeTransformAddHotspots();
- void read(Common::SeekableReadStream *file);
- void apply(NodePtr &node);
+ void read(Common::SeekableReadStream *file) override;
+ void apply(NodePtr &node) override;
private:
int32 _zipBitIndex;
Commit: c1343e8051335d39496325bf9c7dade349377b9e
https://github.com/scummvm/scummvm/commit/c1343e8051335d39496325bf9c7dade349377b9e
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
NANCY: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/nancy/resource.cpp
diff --git a/engines/nancy/resource.cpp b/engines/nancy/resource.cpp
index e42caf5868..7ee58dc6c7 100644
--- a/engines/nancy/resource.cpp
+++ b/engines/nancy/resource.cpp
@@ -108,7 +108,7 @@ class CifFile20 : public CifFile {
public:
CifFile20(const Common::String &name, Common::File *f) : CifFile(name, f) { }
protected:
- virtual void readCifInfo(Common::File &f);
+ void readCifInfo(Common::File &f) override;
};
void CifFile20::readCifInfo(Common::File &f) {
@@ -119,7 +119,7 @@ class CifFile21 : public CifFile {
public:
CifFile21(const Common::String &name, Common::File *f) : CifFile(name, f) { }
protected:
- virtual void readCifInfo(Common::File &f);
+ void readCifInfo(Common::File &f) override;
};
void CifFile21::readCifInfo(Common::File &f) {
@@ -337,9 +337,9 @@ class CifTree20 : public CifTree {
public:
CifTree20(const Common::String &name, const Common::String &ext) : CifTree(name, ext) { }
protected:
- virtual uint readHeader(Common::File &f);
- virtual void readCifInfo(Common::File &f, CifInfoChain &chain);
- virtual uint32 getVersion() const { return 0x00020000; }
+ uint readHeader(Common::File &f) override;
+ void readCifInfo(Common::File &f, CifInfoChain &chain) override;
+ uint32 getVersion() const override { return 0x00020000; }
};
uint CifTree20::readHeader(Common::File &f) {
@@ -373,9 +373,9 @@ public:
CifTree21(const Common::String &name, const Common::String &ext) : CifTree20(name, ext), _hasLongNames(false), _hasOffsetFirst(false) { };
protected:
- virtual uint readHeader(Common::File &f);
- virtual void readCifInfo(Common::File &f, CifInfoChain &chain);
- virtual uint32 getVersion() const { return 0x00020001; }
+ uint readHeader(Common::File &f) override;
+ void readCifInfo(Common::File &f, CifInfoChain &chain) override;
+ uint32 getVersion() const override { return 0x00020001; }
private:
void determineSubtype(Common::File &f);
@@ -547,8 +547,8 @@ bool CifExporter::dump(const byte *data, uint32 size, const ResourceManager::Cif
class CifExporter20 : public CifExporter {
protected:
- virtual void writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const;
- uint32 getVersion() const { return 0x00020000; }
+ void writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const override;
+ uint32 getVersion() const override { return 0x00020000; }
};
void CifExporter20::writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const {
@@ -567,8 +567,8 @@ void CifExporter20::writeCifInfo(Common::DumpFile &f, const ResourceManager::Cif
class CifExporter21 : public CifExporter20 {
protected:
- virtual void writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const;
- uint32 getVersion() const { return 0x00020001; }
+ void writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const override;
+ uint32 getVersion() const override { return 0x00020001; }
};
void CifExporter21::writeCifInfo(Common::DumpFile &f, const ResourceManager::CifInfo &info) const {
Commit: fc95bf1eca31cfa25dab9b8e88b1555818aec054
https://github.com/scummvm/scummvm/commit/fc95bf1eca31cfa25dab9b8e88b1555818aec054
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
PEGASUS: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/pegasus/neighborhood/mars/mars.cpp
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 806fa3da69..1a7f613610 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -184,7 +184,7 @@ class ArthurOxygen50Action : public AIPlayMessageAction {
public:
ArthurOxygen50Action();
- virtual void performAIAction(AIRule *);
+ void performAIAction(AIRule *) override;
};
ArthurOxygen50Action::ArthurOxygen50Action() : AIPlayMessageAction("Images/AI/Mars/XMMAZB1", false, kWarningInterruption) {
@@ -203,7 +203,7 @@ class ArthurOxygen25Action : public AIPlayMessageAction {
public:
ArthurOxygen25Action();
- virtual void performAIAction(AIRule *);
+ void performAIAction(AIRule *) override;
};
ArthurOxygen25Action::ArthurOxygen25Action() : AIPlayMessageAction("Images/AI/Mars/XMMAZB2", false, kWarningInterruption) {
@@ -226,7 +226,7 @@ class ArthurOxygen5Action : public AIPlayMessageAction {
public:
ArthurOxygen5Action();
- virtual void performAIAction(AIRule *);
+ void performAIAction(AIRule *) override;
};
ArthurOxygen5Action::ArthurOxygen5Action() : AIPlayMessageAction("Images/AI/Mars/XMMAZB3", false, kWarningInterruption) {
Commit: d6a4c4f83afc370b6544fdf45f9a1f9a83ea12c2
https://github.com/scummvm/scummvm/commit/d6a4c4f83afc370b6544fdf45f9a1f9a83ea12c2
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
SAGA2: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/saga2/grequest.cpp
engines/saga2/intrface.cpp
engines/saga2/path.cpp
engines/saga2/tilemode.cpp
diff --git a/engines/saga2/grequest.cpp b/engines/saga2/grequest.cpp
index d32be7a806..208f0d0c2d 100644
--- a/engines/saga2/grequest.cpp
+++ b/engines/saga2/grequest.cpp
@@ -107,7 +107,7 @@ public:
void drawClipped(
gPort &port,
const Point16 &offset,
- const Rect16 &r);
+ const Rect16 &r) override;
};
void ModalDialogWindow::positionText(
@@ -317,8 +317,8 @@ public:
ModalDialogWindow(r, ident, cmd, windowText, args) {
}
- void pointerRelease(gPanelMessage &);
- bool keyStroke(gPanelMessage &);
+ void pointerRelease(gPanelMessage &) override;
+ bool keyStroke(gPanelMessage &) override;
};
void ModalDisplayWindow::pointerRelease(gPanelMessage &) {
diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index e49ee286ba..fba85bdb25 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -66,7 +66,7 @@ public:
ArmorAttributes attr;
void drawClipped(gPort &,
const Point16 &,
- const Rect16 &);
+ const Rect16 &) override;
void setValue(PlayerActorID pID);
@@ -184,8 +184,8 @@ class gEnchantmentDisplay : public gControl {
uint8 iconFlags[iconCount];
- void drawClipped(gPort &, const Point16 &, const Rect16 &);
- void pointerMove(gPanelMessage &msg);
+ void drawClipped(gPort &, const Point16 &, const Rect16 &) override;
+ void pointerMove(gPanelMessage &msg) override;
public:
void setValue(PlayerActorID pID);
diff --git a/engines/saga2/path.cpp b/engines/saga2/path.cpp
index 4863d19021..f111a9b6ec 100644
--- a/engines/saga2/path.cpp
+++ b/engines/saga2/path.cpp
@@ -1202,14 +1202,14 @@ public:
DestinationPathRequest(Actor *a, int16 howSmart);
// Initialize the static data members for this path request.
- void initialize();
+ void initialize() override;
// Set and evaluate a new center location.
bool setCenter(
const TilePoint &baseTileCoords,
- const QueueItem &qi);
+ const QueueItem &qi) override;
- bool validMove(const TilePoint &testPt);
+ bool validMove(const TilePoint &testPt) override;
// Evaluate the cost of travelling on these stairs
int16 evaluateStairs(
@@ -1217,10 +1217,10 @@ public:
Direction moveDir,
Direction stairDir,
int16 baseAltitude,
- int16 upperAltitude);
+ int16 upperAltitude) override;
// Evaluate the cost of the specified move
- int16 evaluateMove(const TilePoint &testPt, uint8 testPlatform);
+ int16 evaluateMove(const TilePoint &testPt, uint8 testPlatform) override;
};
/* ===================================================================== *
@@ -1252,16 +1252,16 @@ public:
WanderPathRequest(Actor *a, int16 howSmart);
// Initialize the static data members
- void initialize();
+ void initialize() override;
// Set and evaluate a new center location.
bool setCenter(
const TilePoint &baseTileCoords,
- const QueueItem &qi);
+ const QueueItem &qi) override;
// Determine if point is within the tether region if there is a
// tether
- bool validMove(const TilePoint &testPt);
+ bool validMove(const TilePoint &testPt) override;
// Evaluate the cost of moving on the specified stairs.
int16 evaluateStairs(
@@ -1269,11 +1269,11 @@ public:
Direction moveDir,
Direction stairDir,
int16 baseAltitude,
- int16 upperAltitude);
+ int16 upperAltitude) override;
// Evaluate the cost of moving from the current center location
// to the specified location.
- int16 evaluateMove(const TilePoint &testPt, uint8 testPlatform);
+ int16 evaluateMove(const TilePoint &testPt, uint8 testPlatform) override;
};
/* ===================================================================== *
diff --git a/engines/saga2/tilemode.cpp b/engines/saga2/tilemode.cpp
index fcfacac3b4..75f8593bfa 100644
--- a/engines/saga2/tilemode.cpp
+++ b/engines/saga2/tilemode.cpp
@@ -73,11 +73,11 @@ public:
}
private:
- void deactivate();
+ void deactivate() override;
// void pointerMove( gPanelMessage &msg );
- bool pointerHit(gPanelMessage &msg);
- void pointerRelease(gPanelMessage &msg);
+ bool pointerHit(gPanelMessage &msg) override;
+ void pointerRelease(gPanelMessage &msg) override;
};
/* ===================================================================== *
Commit: 2e2a613e23cfd2826dd65c4fe36f51d1d42e5653
https://github.com/scummvm/scummvm/commit/2e2a613e23cfd2826dd65c4fe36f51d1d42e5653
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T14:34:14+02:00
Commit Message:
STARK: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/stark/formats/iss.cpp
engines/stark/formats/xarc.cpp
diff --git a/engines/stark/formats/iss.cpp b/engines/stark/formats/iss.cpp
index 0fc37954f3..0d263b7e42 100644
--- a/engines/stark/formats/iss.cpp
+++ b/engines/stark/formats/iss.cpp
@@ -38,7 +38,7 @@ public:
: Ima_ADPCMStream(stream, disposeAfterUse, size, rate, channels, blockAlign) {}
protected:
- int readBuffer(int16 *buffer, const int numSamples) {
+ int readBuffer(int16 *buffer, const int numSamples) override {
// Similar to MS IMA, but without the four-bytes-per-channel requirement
int samples;
diff --git a/engines/stark/formats/xarc.cpp b/engines/stark/formats/xarc.cpp
index 969e05fd40..cbae93a5e8 100644
--- a/engines/stark/formats/xarc.cpp
+++ b/engines/stark/formats/xarc.cpp
@@ -39,8 +39,8 @@ class XARCMember : public Common::ArchiveMember {
public:
XARCMember(const XARCArchive *xarc, Common::ReadStream &stream, uint32 offset);
- Common::SeekableReadStream *createReadStream() const;
- Common::String getName() const { return _name; }
+ Common::SeekableReadStream *createReadStream() const override;
+ Common::String getName() const override { return _name; }
uint32 getLength() const { return _length; }
uint32 getOffset() const { return _offset; }
More information about the Scummvm-git-logs
mailing list