[Scummvm-git-logs] scummvm master -> 6ec2329fc97a0bcd5dbeb21be8d34f6ed2e7b65f

[NMIError]

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

Summary:
6ec2329fc9 AGOS: Fix compiler warnings


Commit: 6ec2329fc97a0bcd5dbeb21be8d34f6ed2e7b65f
    https://github.com/scummvm/scummvm/commit/6ec2329fc97a0bcd5dbeb21be8d34f6ed2e7b65f
Author: Coen Rampen (crampen at gmail.com)
Date: 2022-05-09T20:21:00+02:00

Commit Message:
AGOS: Fix compiler warnings

Add missing override, fix bad memset, remove unused variable.

Changed paths:
    engines/agos/drivers/accolade/casio.h
    engines/agos/midiparser_gmf.cpp


diff --git a/engines/agos/drivers/accolade/casio.h b/engines/agos/drivers/accolade/casio.h
index 4d1bbafa574..cb300faeff2 100644
--- a/engines/agos/drivers/accolade/casio.h
+++ b/engines/agos/drivers/accolade/casio.h
@@ -30,7 +30,7 @@ class MidiDriver_Accolade_Casio : public MidiDriver_Casio {
 public:
 	MidiDriver_Accolade_Casio();
 
-	int open();
+	int open() override;
 	int8 mapSourceChannel(uint8 source, uint8 dataChannel) override;
 
 	void readDriverData(byte *driverData, uint16 driverDataSize);
diff --git a/engines/agos/midiparser_gmf.cpp b/engines/agos/midiparser_gmf.cpp
index 5d564e4de9e..b55fffaa5a2 100644
--- a/engines/agos/midiparser_gmf.cpp
+++ b/engines/agos/midiparser_gmf.cpp
@@ -97,7 +97,6 @@ bool MidiParser_GMF::loadMusic(byte *data, uint32 size) {
 
 	// Determine start and end of the MIDI track(s) in the data, as well as
 	// tempo and loop flag.
-	byte midiType;
 	uint8 headerTempo;
 	bool headerLoop;
 
@@ -106,7 +105,6 @@ bool MidiParser_GMF::loadMusic(byte *data, uint32 size) {
 	// respectively.
 	if (!memcmp(data, "GMF", 3)) {
 		// Single track file.
-		midiType = 0;
 		_numTracks = 1;
 
 		// GMF header is GMF<majorVersion><minorVersion><tempo><loop>.
@@ -119,7 +117,6 @@ bool MidiParser_GMF::loadMusic(byte *data, uint32 size) {
 		_tracksEndPos[0] = data + size;
 	} else {
 		// Assume multi-track file.
-		midiType = 2;
 
 		// Each track has its own GMF header, but tempo and loop flags are all
 		// the same for Simon 1.