[Scummvm-git-logs] scummvm master -> 674bd26d2613af44cfad789e081bb543656c53f0

[NMIError]

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

Summary:
9d800bd7c4 AGOS: Fix compiler warning
674bd26d26 ULTIMA6: Fix compiler warning


Commit: 9d800bd7c459dc1691fb2f7314a7d3e994c75a8d
    https://github.com/scummvm/scummvm/commit/9d800bd7c459dc1691fb2f7314a7d3e994c75a8d
Author: Coen Rampen (crampen at gmail.com)
Date: 2025-02-07T16:15:38+01:00

Commit Message:
AGOS: Fix compiler warning

Changed paths:
    engines/agos/midiparser_simonwin.cpp


diff --git a/engines/agos/midiparser_simonwin.cpp b/engines/agos/midiparser_simonwin.cpp
index 37fb38dcd69..81ad0090468 100644
--- a/engines/agos/midiparser_simonwin.cpp
+++ b/engines/agos/midiparser_simonwin.cpp
@@ -109,10 +109,7 @@ bool MidiParser_SimonWin::loadMusic(byte *data, uint32 size) {
 	debug(2, "MidiParser_SimonWin::loadMusic: %d tracks", _numTracks);
 
 	// Read the tracks.
-	byte *trackDataStart;
 	for (int i = 0; i < _numTracks; ++i) {
-		trackDataStart = pos;
-
 		// Read the track header.
 
 		// Make sure there's a MThd.


Commit: 674bd26d2613af44cfad789e081bb543656c53f0
    https://github.com/scummvm/scummvm/commit/674bd26d2613af44cfad789e081bb543656c53f0
Author: Coen Rampen (crampen at gmail.com)
Date: 2025-02-07T16:15:38+01:00

Commit Message:
ULTIMA6: Fix compiler warning

Changed paths:
    engines/ultima/nuvie/sound/midiparser_m.cpp


diff --git a/engines/ultima/nuvie/sound/midiparser_m.cpp b/engines/ultima/nuvie/sound/midiparser_m.cpp
index 2a7b7ed8872..048a29f7346 100644
--- a/engines/ultima/nuvie/sound/midiparser_m.cpp
+++ b/engines/ultima/nuvie/sound/midiparser_m.cpp
@@ -178,7 +178,8 @@ bool MidiParser_M::processEvent(const EventInfo& info, bool fireEvents) {
 
 void MidiParser_M::parseNextEvent(EventInfo &info) {
 	byte *playPos = _position._subtracks[0]._playPos;
-	assert(playPos - _tracks[0][0] < _trackLength);
+	assert(playPos >= _tracks[0][0]);
+	assert(playPos - _tracks[0][0] < (int)_trackLength);
 
 	info.start = playPos;
 	info.event = *(playPos++);