[Scummvm-git-logs] scummvm master -> 2ae66b7a00b8c4e8828eafb9081ae79553149fd7

[athrxx]

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:
2ae66b7a00 KYRA: fix Pandora build


Commit: 2ae66b7a00b8c4e8828eafb9081ae79553149fd7
    https://github.com/scummvm/scummvm/commit/2ae66b7a00b8c4e8828eafb9081ae79553149fd7
Author: athrxx (athrxx at scummvm.org)
Date: 2020-02-01T21:35:03+01:00

Commit Message:
KYRA: fix Pandora build

(missing #ifdef in case the EOB engine is disabled)

Changed paths:
    engines/kyra/sound/sound_pc_v1.cpp


diff --git a/engines/kyra/sound/sound_pc_v1.cpp b/engines/kyra/sound/sound_pc_v1.cpp
index 4d52993..a370e2e 100644
--- a/engines/kyra/sound/sound_pc_v1.cpp
+++ b/engines/kyra/sound/sound_pc_v1.cpp
@@ -73,11 +73,15 @@ SoundPC_v1::SoundPC_v1(KyraEngine_v1 *vm, Audio::Mixer *mixer, kType type)
 		break;
 	}
 
+#ifdef ENABLE_EOB
 	// Correct the type to someting we support. NullSound is treated as a silent AdLib driver.
 	if (_type != kAdLib && _type != kPCSpkr && _type != kPCjr)
 		_type = kAdLib;
-
 	_driver = (type == kAdLib) ? PCSoundDriver::createAdLib(mixer, _version) : PCSoundDriver::createPCSpk(mixer, _type == kPCjr);
+#else
+	_type = kAdLib;
+	_driver = PCSoundDriver::createAdLib(mixer, _version);
+#endif
 	assert(_driver);
 }