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

[sev-]

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

Summary:
a5ed6cdf5e SCUMM: Add missing override keywords
b657ff8ef2 GROOVIE: Fix warning of mismatched prototype
b0c853c992 SCUMM: Comment out unused class variables


Commit: a5ed6cdf5e27b58851967f4676f43a946ee313f0
    https://github.com/scummvm/scummvm/commit/a5ed6cdf5e27b58851967f4676f43a946ee313f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-18T19:02:18+01:00

Commit Message:
SCUMM: Add missing override keywords

Changed paths:
    engines/scumm/gfx_mac.h


diff --git a/engines/scumm/gfx_mac.h b/engines/scumm/gfx_mac.h
index 907b467e0da..153082c5e58 100644
--- a/engines/scumm/gfx_mac.h
+++ b/engines/scumm/gfx_mac.h
@@ -291,21 +291,21 @@ public:
 	public:
 		MacEditText(MacGui::MacDialogWindow *window, Common::Rect bounds, Common::String text, bool enabled);
 
-		void getFocus() {}
-		void loseFocus() {}
+		void getFocus() override {}
+		void loseFocus() override {}
 
 		void selectAll();
 
-		bool useBeamCursor() { return true; }
-		bool findWidget(int x, int y) const;
+		bool useBeamCursor() override { return true; }
+		bool findWidget(int x, int y) const override;
 		bool shouldDeferAction() override { return true; }
 
-		void draw(bool drawFocused = false);
+		void draw(bool drawFocused = false) override;
 
-		void handleMouseDown(Common::Event &event);
-		bool handleKeyDown(Common::Event &event);
-		void handleMouseMove(Common::Event &event);
-		void handleMouseHeld();
+		void handleMouseDown(Common::Event &event) override;
+		bool handleKeyDown(Common::Event &event) override;
+		void handleMouseMove(Common::Event &event) override;
+		void handleMouseHeld() override;
 	};
 
 	class MacPicture : public MacWidget {


Commit: b657ff8ef21209a9cc7dfd32fdc9bbbb07533188
    https://github.com/scummvm/scummvm/commit/b657ff8ef21209a9cc7dfd32fdc9bbbb07533188
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-18T19:02:18+01:00

Commit Message:
GROOVIE: Fix warning of mismatched prototype

Changed paths:
    engines/groovie/logic/gallery.cpp
    engines/groovie/logic/gallery.h


diff --git a/engines/groovie/logic/gallery.cpp b/engines/groovie/logic/gallery.cpp
index 9d0f682f677..f03258eaf20 100644
--- a/engines/groovie/logic/gallery.cpp
+++ b/engines/groovie/logic/gallery.cpp
@@ -57,7 +57,6 @@ const byte GalleryGame::kGalleryLinks[21][10] = {
 	{12, 14, 15, 18, 20,  0,  0,  0,  0,  0 }	// 21
 };
 
-const int kPieceCount = 21;
 enum kGalleryPieceStatus {
 	kPieceUnselected = 0,
 	kPieceSelected = 1
diff --git a/engines/groovie/logic/gallery.h b/engines/groovie/logic/gallery.h
index 54c56ce90ee..4c98afbcce5 100644
--- a/engines/groovie/logic/gallery.h
+++ b/engines/groovie/logic/gallery.h
@@ -76,6 +76,8 @@ namespace Groovie {
  * +-----------+--------+-----------------------------------------+
  */
 
+const int kPieceCount = 21;
+
 class GalleryGame {
 public:
 	GalleryGame(bool easierAi) {
@@ -95,7 +97,7 @@ private:
 
 	void test();
 	void ensureSamanthaWins(int seed);
-	void testsWriteMove(int move, byte pieceStatus[]);
+	void testsWriteMove(int move, byte pieceStatus[kPieceCount]);
 };
 
 } // End of Groovie namespace


Commit: b0c853c992830f259c16225ae12abb9cf4e9d358
    https://github.com/scummvm/scummvm/commit/b0c853c992830f259c16225ae12abb9cf4e9d358
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-18T19:02:18+01:00

Commit Message:
SCUMM: Comment out unused class variables

Changed paths:
    engines/scumm/gfx_mac.h


diff --git a/engines/scumm/gfx_mac.h b/engines/scumm/gfx_mac.h
index 153082c5e58..6630d3619dd 100644
--- a/engines/scumm/gfx_mac.h
+++ b/engines/scumm/gfx_mac.h
@@ -219,7 +219,7 @@ public:
 	class MacCheckbox : public MacWidget {
 	private:
 		Common::Rect _hitBounds;
-		bool _isChecked = false;
+		//bool _isChecked = false;
 
 	public:
 		MacCheckbox(MacGui::MacDialogWindow *window, Common::Rect bounds, Common::String text, bool enabled);
@@ -273,7 +273,7 @@ public:
 		int _caretX = -1;
 
 		uint32 _lastClickTime = 0;
-		uint32 _lastScrollTime = 0;
+		//uint32 _lastScrollTime = 0;
 
 		int _lastClickX = 0;
 
@@ -395,8 +395,8 @@ public:
 		MacPicture *_handle;
 		int _minX;
 		int _maxX;
-		int _leftMargin;
-		int _rightMargin;
+		//int _leftMargin;
+		//int _rightMargin;
 
 		void eraseHandle();
 		void drawHandle();
@@ -405,7 +405,7 @@ public:
 		 MacPictureSlider(MacGui::MacDialogWindow *window, MacPicture *background, MacPicture *handle, bool enabled, int minX, int maxX, int minValue, int maxValue, int leftMargin, int rightMargin)
 			: MacSliderBase(window, background->getBounds(), minValue, maxValue, minX + leftMargin, maxX - rightMargin, enabled),
 			_background(background), _handle(handle), _minX(minX),
-			_maxX(maxX), _leftMargin(leftMargin), _rightMargin(rightMargin) {}
+			_maxX(maxX)/*, _leftMargin(leftMargin), _rightMargin(rightMargin) */ {}
 
 		bool findWidget(int x, int y) const;
 		void draw(bool drawFocused = false);
@@ -485,7 +485,7 @@ public:
 
 		MacWidget *_defaultWidget = nullptr;
 
-		int _mouseOverWidget = -1;
+		//int _mouseOverWidget = -1;
 		MacWidget *_focusedWidget = nullptr;
 		Common::Point _focusClick;
 		Common::Point _oldMousePos;