[Scummvm-git-logs] scummvm master -> 90620e0b5defa9c6a9b519f0da197aef8eac4cc4

[bluegr]

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:
90620e0b5d SCUMM: Always build with Player_HE support


Commit: 90620e0b5defa9c6a9b519f0da197aef8eac4cc4
    https://github.com/scummvm/scummvm/commit/90620e0b5defa9c6a9b519f0da197aef8eac4cc4
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-11-16T09:29:02+02:00

Commit Message:
SCUMM: Always build with Player_HE support

Changed paths:
    engines/scumm/players/player_he.cpp
    engines/scumm/players/player_he.h
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/players/player_he.cpp b/engines/scumm/players/player_he.cpp
index 68e5ad26c86..91c19811ec0 100644
--- a/engines/scumm/players/player_he.cpp
+++ b/engines/scumm/players/player_he.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#ifdef ENABLE_HE
-
 #include "scumm/players/player_he.h"
 #include "scumm/scumm.h"
 #include "scumm/file.h"
@@ -236,5 +234,3 @@ void Player_HE::send(uint32 b) {
 }
 
 }
-
-#endif
diff --git a/engines/scumm/players/player_he.h b/engines/scumm/players/player_he.h
index 62215112ecc..b12525edd14 100644
--- a/engines/scumm/players/player_he.h
+++ b/engines/scumm/players/player_he.h
@@ -29,8 +29,6 @@
 
 class MidiParser;
 
-#ifdef ENABLE_HE
-
 namespace Scumm {
 class ScummEngine;
 
@@ -71,5 +69,3 @@ private:
 }
 
 #endif
-
-#endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 866cd98adeb..961d8b976d4 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2032,10 +2032,8 @@ void ScummEngine::setupMusic(int midi, const Common::String &macInstrumentFile)
 		// support this with the Player_AD code at the moment. The reason here
 		// is that multi MIDI is supported internally by our iMuse output.
 		_musicEngine = new Player_AD(this, _mixer->mutex());
-#ifdef ENABLE_HE
 	} else if (_game.platform == Common::kPlatformDOS && _sound->_musicType == MDT_ADLIB && _game.heversion >= 60) {
 		_musicEngine = new Player_HE(this);
-#endif
 	} else if (_game.version >= 3 && _game.heversion <= 62) {
 		MidiDriver *nativeMidiDriver = nullptr;
 		MidiDriver *adlibMidiDriver = nullptr;