[Scummvm-git-logs] scummvm master -> f40455c74c53c7903f54e85b3f671910d9e4df9f

[sev-]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cdce001dcb VIDEO: Fix printf format warning
0d5ecf61e2 GRIM: Add missing override keyword
72f0e5942a MM: MM1: Added missing override keywords
f40455c74c NEVERHOOD: Added missing override keyword


Commit: cdce001dcb0046362eeaa664b6024cabe4cc73be
    https://github.com/scummvm/scummvm/commit/cdce001dcb0046362eeaa664b6024cabe4cc73be
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-05T23:45:52+01:00

Commit Message:
VIDEO: Fix printf format warning

Changed paths:
    video/mkv_decoder.cpp


diff --git a/video/mkv_decoder.cpp b/video/mkv_decoder.cpp
index 0b1a8d082b3..1ec5e3bbac7 100644
--- a/video/mkv_decoder.cpp
+++ b/video/mkv_decoder.cpp
@@ -156,7 +156,7 @@ bool MKVDecoder::loadStream(Common::SeekableReadStream *stream) {
 	uint32 i = 0;
 	const unsigned long j = _pTracks->GetTracksCount();
 
-	debug(1, "Number of tracks: %d", j);
+	debug(1, "Number of tracks: %lu", j);
 
 	enum {VIDEO_TRACK = 1, AUDIO_TRACK = 2};
 	_vTrack = -1;


Commit: 0d5ecf61e22551120354abf3ad571f3c47c2b050
    https://github.com/scummvm/scummvm/commit/0d5ecf61e22551120354abf3ad571f3c47c2b050
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-05T23:46:09+01:00

Commit Message:
GRIM: Add missing override keyword

Changed paths:
    engines/grim/font.h


diff --git a/engines/grim/font.h b/engines/grim/font.h
index edd292c5266..ef306a1bebd 100644
--- a/engines/grim/font.h
+++ b/engines/grim/font.h
@@ -88,7 +88,7 @@ public:
 	uint32 getDataSize() const { return _dataSize; }
 	bool is8Bit() const override;
 
-	int getKernedStringLength(const Common::String &text) const;
+	int getKernedStringLength(const Common::String &text) const override;
 	int getBitmapStringLength(const Common::String &text) const;
 	int getStringHeight(const Common::String &text) const;
 


Commit: 72f0e5942ac8c517e14cbc5603ee1fddff813571
    https://github.com/scummvm/scummvm/commit/72f0e5942ac8c517e14cbc5603ee1fddff813571
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-05T23:46:10+01:00

Commit Message:
MM: MM1: Added missing override keywords

Changed paths:
    engines/mm/mm1/views_enh/character_select.h
    engines/mm/mm1/views_enh/locations/tavern.h
    engines/mm/mm1/views_enh/locations/training.h


diff --git a/engines/mm/mm1/views_enh/character_select.h b/engines/mm/mm1/views_enh/character_select.h
index 591adebf7ec..1f0ef297c7b 100644
--- a/engines/mm/mm1/views_enh/character_select.h
+++ b/engines/mm/mm1/views_enh/character_select.h
@@ -40,7 +40,7 @@ protected:
 	/**
 	 * Return true if a character should be selected by default
 	 */
-	virtual bool selectCharByDefault() const {
+	virtual bool selectCharByDefault() const override {
 		return false;
 	}
 public:
diff --git a/engines/mm/mm1/views_enh/locations/tavern.h b/engines/mm/mm1/views_enh/locations/tavern.h
index a751b260b24..8525a2c18a0 100644
--- a/engines/mm/mm1/views_enh/locations/tavern.h
+++ b/engines/mm/mm1/views_enh/locations/tavern.h
@@ -51,7 +51,7 @@ public:
 	Tavern();
 
 	void draw() override;
-	bool msgGame(const GameMessage &msg);
+	bool msgGame(const GameMessage &msg) override;
 	bool msgKeypress(const KeypressMessage &msg) override;
 	bool msgAction(const ActionMessage &msg) override;
 	void messageShown() override;
diff --git a/engines/mm/mm1/views_enh/locations/training.h b/engines/mm/mm1/views_enh/locations/training.h
index f59dd239e3f..5cbc03e8730 100644
--- a/engines/mm/mm1/views_enh/locations/training.h
+++ b/engines/mm/mm1/views_enh/locations/training.h
@@ -58,7 +58,7 @@ public:
 
 	bool msgFocus(const FocusMessage &msg) override;
 	void draw() override;
-	bool msgGame(const GameMessage &msg);
+	bool msgGame(const GameMessage &msg) override;
 	bool msgKeypress(const KeypressMessage &msg) override;
 	bool msgAction(const ActionMessage &msg) override;
 	void messageShown() override;


Commit: f40455c74c53c7903f54e85b3f671910d9e4df9f
    https://github.com/scummvm/scummvm/commit/f40455c74c53c7903f54e85b3f671910d9e4df9f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-05T23:46:10+01:00

Commit Message:
NEVERHOOD: Added missing override keyword

Changed paths:
    engines/neverhood/metaengine.cpp


diff --git a/engines/neverhood/metaengine.cpp b/engines/neverhood/metaengine.cpp
index 1a9217fda19..0de8b117d69 100644
--- a/engines/neverhood/metaengine.cpp
+++ b/engines/neverhood/metaengine.cpp
@@ -63,7 +63,7 @@ public:
 		return "neverhood";
 	}
 
-	GUI::OptionsContainerWidget *buildEngineOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
+	GUI::OptionsContainerWidget *buildEngineOptionsWidget(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override {
 		return new Neverhood::NeverhoodOptionsWidget(boss, name, target);
 	}