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

[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:
f29cdfcf46 TUCKER: fix xPos comparison in location 65
9d8f94d79c TOUCHE: _channelsVolume is already reset in Audio::MidiPlayer
a9e7fbe7e4 TOUCHE: MidiPlayer::_gmToRol is 128 bytes long


Commit: f29cdfcf46a58f13aac36eedf3d04a914ac4ee1a
    https://github.com/scummvm/scummvm/commit/f29cdfcf46a58f13aac36eedf3d04a914ac4ee1a
Author: Gregory Montoir (cyx at users.sourceforge.net)
Date: 2022-05-22T08:47:09+02:00

Commit Message:
TUCKER: fix xPos comparison in location 65

The FIXME was based on the disassembly wrongly using yPos in the
first condition. Flag[189] should only be set when xPos is in
manhole object range.

Changed paths:
    engines/tucker/locations.cpp


diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 1d78d3839e1..d09ea199430 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2813,14 +2813,14 @@ void TuckerEngine::updateSprite_locationNum65(int i) {
 		_spritesTable[i]._gfxBackgroundOffset = 100;
 	} else if (_flagsTable[188] > 0 && _flagsTable[189] > 0) {
 		state = -1;
-		if (_xPosCurrent < 150 || _yPosCurrent > 240) {
+		if (_xPosCurrent < 150 || _xPosCurrent > 240) {
 			_flagsTable[189] = 0;
 		}
 	} else {
-		if (_xPosCurrent >= 150 && _yPosCurrent < 240) { // FIXME: bug
+		if (_xPosCurrent >= 150 && _xPosCurrent < 240) {
 			if (getRandomNumber() > 32000) {
 				state = 2;
-				_flagsTable[189] = 1;
+				_flagsTable[189] = 1; // animate manhole
 			} else {
 				state = -1;
 			}


Commit: 9d8f94d79cfcc5ef31bdd7faf7d0d3e147dc0d68
    https://github.com/scummvm/scummvm/commit/9d8f94d79cfcc5ef31bdd7faf7d0d3e147dc0d68
Author: Gregory Montoir (cyx at users.sourceforge.net)
Date: 2022-05-22T08:47:09+02:00

Commit Message:
TOUCHE: _channelsVolume is already reset in Audio::MidiPlayer

Changed paths:
    engines/touche/midi.cpp


diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index df8cb25fe2f..5c7197b185e 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -42,9 +42,6 @@ static const uint8 _gmToRol[256] = {
 
 MidiPlayer::MidiPlayer() {
 
-	// FIXME: Necessary?
-	memset(_channelsVolume, 0, sizeof(_channelsVolume));
-
 	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
 	_nativeMT32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32"));
 	_driver = MidiDriver::createMidi(dev);


Commit: a9e7fbe7e4ffaeea446b21bd51e2d134306fc7ed
    https://github.com/scummvm/scummvm/commit/a9e7fbe7e4ffaeea446b21bd51e2d134306fc7ed
Author: Gregory Montoir (cyx at users.sourceforge.net)
Date: 2022-05-22T08:47:09+02:00

Commit Message:
TOUCHE: MidiPlayer::_gmToRol is 128 bytes long

Changed paths:
    engines/touche/midi.cpp


diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp
index 5c7197b185e..b8f85addc2c 100644
--- a/engines/touche/midi.cpp
+++ b/engines/touche/midi.cpp
@@ -28,7 +28,7 @@
 
 namespace Touche {
 
-static const uint8 _gmToRol[256] = {
+static const uint8 _gmToRol[128] = {
 	0x01, 0x02, 0x03, 0x08, 0x04, 0x05, 0x11, 0x14, 0x66, 0x66, 0x66, 0x62, 0x69, 0x68, 0x67, 0x26,
 	0x09, 0x0A, 0x0B, 0x0E, 0x0F, 0x10, 0x10, 0x10, 0x3C, 0x3D, 0x3D, 0x3D, 0x3D, 0x3E, 0x3F, 0x3F,
 	0x47, 0x41, 0x42, 0x48, 0x45, 0x46, 0x1D, 0x1E, 0x35, 0x36, 0x37, 0x39, 0x33, 0x34, 0x3A, 0x71,