[Scummvm-git-logs] scummvm master -> 1b501be3b721d9bbddb629257fd988e77c46b10e

[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:
1e8e275a9f PETKA: Fix warning
927825f6ac GRAPHICS: MACGUI: Fix overridden method footprint
1b501be3b7 AUDIO: Align overridden methods


Commit: 1e8e275a9f9745714dd3e77b2ba7b3246eb955c3
    https://github.com/scummvm/scummvm/commit/1e8e275a9f9745714dd3e77b2ba7b3246eb955c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:16:55+02:00

Commit Message:
PETKA: Fix warning

Changed paths:
    engines/petka/objects/object_star.cpp


diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index 4168254515..443805506c 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -33,7 +33,7 @@
 
 namespace Petka {
 
-const uint kFirstCursorId = 5001;
+//const uint kFirstCursorId = 5001;
 const uint kCaseButtonIndex = 0;
 
 QObjectStar::QObjectStar() {


Commit: 927825f6acbbb851e788c2c3feed9d9e5a9dfa00
    https://github.com/scummvm/scummvm/commit/927825f6acbbb851e788c2c3feed9d9e5a9dfa00
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:17:18+02:00

Commit Message:
GRAPHICS: MACGUI: Fix overridden method footprint

Changed paths:
    graphics/macgui/mactextwindow.cpp
    graphics/macgui/mactextwindow.h


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 50d4befbe6..ce2c4bedc4 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -78,7 +78,7 @@ MacTextWindow::MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgco
 		g_system->getTimerManager()->installTimerProc(&cursorTimerHandler, 200000, this, "textWindowCursor");
 }
 
-void MacTextWindow::resize(int w, int h) {
+void MacTextWindow::resize(int w, int h, bool inner) {
 	if (_surface.w == w && _surface.h == h)
 		return;
 
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index b59c92de63..690ce29c86 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -33,7 +33,7 @@ public:
 	MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, MacMenu *menu, bool cursorHandler = true);
 	virtual ~MacTextWindow();
 
-	virtual void resize(int w, int h);
+	virtual void resize(int w, int h, bool inner = false);
 
 	virtual bool processEvent(Common::Event &event);
 


Commit: 1b501be3b721d9bbddb629257fd988e77c46b10e
    https://github.com/scummvm/scummvm/commit/1b501be3b721d9bbddb629257fd988e77c46b10e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-07T12:18:20+02:00

Commit Message:
AUDIO: Align overridden methods

Changed paths:
    audio/adlib.cpp


diff --git a/audio/adlib.cpp b/audio/adlib.cpp
index 081aa168a7..89a15b475f 100644
--- a/audio/adlib.cpp
+++ b/audio/adlib.cpp
@@ -936,7 +936,7 @@ public:
 	int open() override;
 	void close() override;
 	void send(uint32 b) override;
-	void send(byte channel, uint32 b); // Supports higher than channel 15
+	void send(int8 channel, uint32 b) override; // Supports higher than channel 15
 	uint32 property(int prop, uint32 param) override;
 	bool isOpen() const override { return _isOpen; }
 	uint32 getBaseTempo() override { return 1000000 / OPL::OPL::kDefaultCallbackFrequency; }
@@ -1488,7 +1488,7 @@ void MidiDriver_ADLIB::send(uint32 b) {
 	send(b & 0xF, b & 0xFFFFFFF0);
 }
 
-void MidiDriver_ADLIB::send(byte chan, uint32 b) {
+void MidiDriver_ADLIB::send(int8 chan, uint32 b) {
 	//byte param3 = (byte) ((b >> 24) & 0xFF);
 	byte param2 = (byte)((b >> 16) & 0xFF);
 	byte param1 = (byte)((b >>  8) & 0xFF);