[Scummvm-git-logs] scummvm master -> 8536fd97942466c40e5a4fdd1365d9b100b4c70b

[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:
8536fd9794 AGOS: Fix AdLib instrument remapping check


Commit: 8536fd97942466c40e5a4fdd1365d9b100b4c70b
    https://github.com/scummvm/scummvm/commit/8536fd97942466c40e5a4fdd1365d9b100b4c70b
Author: Coen Rampen (crampen at gmail.com)
Date: 2022-06-02T20:06:04+02:00

Commit Message:
AGOS: Fix AdLib instrument remapping check

_instrumentRemapping is always set in readDriverData, so this check is unnecessary.

Changed paths:
    engines/agos/drivers/accolade/adlib.cpp


diff --git a/engines/agos/drivers/accolade/adlib.cpp b/engines/agos/drivers/accolade/adlib.cpp
index 7b55962b2a7..6ca7840bf50 100644
--- a/engines/agos/drivers/accolade/adlib.cpp
+++ b/engines/agos/drivers/accolade/adlib.cpp
@@ -147,9 +147,8 @@ void MidiDriver_Accolade_AdLib::deinitSource(uint8 source) {
 		if (_oplType != OPL::Config::kOpl3) {
 			// For OPL2, get the current music instrument for this OPL channel.
 			program = _controlData[0][channel].program;
-			if (_instrumentRemapping)
-				// Apply instrument remapping (if specified) to instrument channels.
-				program = _instrumentRemapping[program];
+			// Apply instrument remapping to instrument channels.
+			program = _instrumentRemapping[program];
 		}
 
 		InstrumentInfo instrument { };