[Scummvm-git-logs] scummvm master -> 12c5f02e712aa09e60612bd2fd6348e50cc3d65b

[bluegr]

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:
64538394ec Fixed missing background sound in Gob1
12c5f02e71 Minimized changes for PR


Commit: 64538394ecb2f8f06ea5041385c79e4d956befee
    https://github.com/scummvm/scummvm/commit/64538394ecb2f8f06ea5041385c79e4d956befee
Author: Antonin Carette (acarette at redartgames.com)
Date: 2024-08-31T17:41:18+03:00

Commit Message:
Fixed missing background sound in Gob1

Changed paths:
    engines/gob/sound/sound.cpp
    engines/gob/sound/sound.h


diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 689427b716d..1479f0572aa 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -55,9 +55,7 @@ Sound::Sound(GobEngine *vm) : _vm(vm) {
 	_cdrom = nullptr;
 	_bgatmos = nullptr;
 
-	_hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
-
-	_hasAdLibBg = _hasAdLib;
+	_hasAdLibBg = _hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
 
 	if (!_vm->_noMusic && (_vm->getPlatform() == Common::kPlatformAmiga)) {
 		_infogrames = new Infogrames(*_vm->_mixer);
@@ -337,7 +335,7 @@ void Sound::adlibPlayTrack(const char *trackname) {
 }
 
 void Sound::adlibPlayBgMusic() {
-	if (!_hasAdLib || _hasAdLibBg)
+	if (!_hasAdLib || !_hasAdLibBg) // If one of those is disabled, then stop there 
 		return;
 
 	createADLPlayer();
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index e4f80c826ab..d34aa695222 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -154,8 +154,8 @@ public:
 private:
 	GobEngine *_vm;
 
-	bool _hasAdLib;
-	bool _hasAdLibBg;
+	bool _hasAdLib   = false;
+	bool _hasAdLibBg = false;
 
 	SoundDesc _sounds[kSoundsCount];
 


Commit: 12c5f02e712aa09e60612bd2fd6348e50cc3d65b
    https://github.com/scummvm/scummvm/commit/12c5f02e712aa09e60612bd2fd6348e50cc3d65b
Author: Antonin Carette (acarette at redartgames.com)
Date: 2024-08-31T17:41:18+03:00

Commit Message:
Minimized changes for PR

Changed paths:
    engines/gob/sound/sound.cpp
    engines/gob/sound/sound.h


diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 1479f0572aa..d4c216dd255 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -55,7 +55,9 @@ Sound::Sound(GobEngine *vm) : _vm(vm) {
 	_cdrom = nullptr;
 	_bgatmos = nullptr;
 
-	_hasAdLibBg = _hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
+	_hasAdLib = (!_vm->_noMusic && _vm->hasAdLib());
+
+	_hasAdLibBg = _hasAdLib;
 
 	if (!_vm->_noMusic && (_vm->getPlatform() == Common::kPlatformAmiga)) {
 		_infogrames = new Infogrames(*_vm->_mixer);
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index d34aa695222..e4f80c826ab 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -154,8 +154,8 @@ public:
 private:
 	GobEngine *_vm;
 
-	bool _hasAdLib   = false;
-	bool _hasAdLibBg = false;
+	bool _hasAdLib;
+	bool _hasAdLibBg;
 
 	SoundDesc _sounds[kSoundsCount];