[Scummvm-git-logs] scummvm master -> 1746134db6bf819a9840968578aae88c6e17c500

[alxpnv]

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:
24aec76a30 ASYLUM: fix the GMM not showing up on the game menu screen
bdbb14823d ASYLUM: fix the scary music not playing in chapter 2
1746134db6 ASYLUM: prevent Armed Max from going to idle state


Commit: 24aec76a3051607a152ec41d1ab6100f6ee4a26c
    https://github.com/scummvm/scummvm/commit/24aec76a3051607a152ec41d1ab6100f6ee4a26c
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-05-24T15:58:17+03:00

Commit Message:
ASYLUM: fix the GMM not showing up on the game menu screen

Changed paths:
    engines/asylum/asylum.cpp
    engines/asylum/views/menu.h


diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index 4d39cac650..5a51b69b29 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -376,7 +376,7 @@ void AsylumEngine::handleEvents() {
 	Common::Keymapper *const keymapper = _eventMan->getKeymapper();
 
 	while (_eventMan->pollEvent(ev)) {
-		keymapper->setEnabled(_handler == _scene);
+		keymapper->setEnabled(_handler == _scene || (_handler == _menu && !_menu->isEditingSavegameName()));
 		switch (ev.type) {
 		default:
 			break;
diff --git a/engines/asylum/views/menu.h b/engines/asylum/views/menu.h
index f65eeef16d..82a140e39e 100644
--- a/engines/asylum/views/menu.h
+++ b/engines/asylum/views/menu.h
@@ -63,6 +63,8 @@ public:
 	void setDword455C78(bool state) { _dword_455C78 = state; }
 	void setDword455C80(bool state) { _dword_455C80 = state; }
 
+	bool isEditingSavegameName() { return _activeScreen == kMenuSaveGame && _isEditingSavegameName; };
+
 private:
 	AsylumEngine *_vm;
 


Commit: bdbb14823dd32015a452a10921c52f62500316a4
    https://github.com/scummvm/scummvm/commit/bdbb14823dd32015a452a10921c52f62500316a4
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-05-24T15:58:17+03:00

Commit Message:
ASYLUM: fix the scary music not playing in chapter 2

Changed paths:
    engines/asylum/system/sound.cpp


diff --git a/engines/asylum/system/sound.cpp b/engines/asylum/system/sound.cpp
index d5681c0f87..9cc3c53206 100644
--- a/engines/asylum/system/sound.cpp
+++ b/engines/asylum/system/sound.cpp
@@ -90,7 +90,7 @@ void Sound::playMusic(ResourceId resourceId, int32 volume) {
 
 	// Check if music is already playing
 	if (_mixer->isSoundHandleActive(_musicHandle))
-		return;
+		stopMusic();
 
 	if (!isValidSoundResource(resourceId))
 		return;


Commit: 1746134db6bf819a9840968578aae88c6e17c500
    https://github.com/scummvm/scummvm/commit/1746134db6bf819a9840968578aae88c6e17c500
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-05-24T15:58:18+03:00

Commit Message:
ASYLUM: prevent Armed Max from going to idle state

Changed paths:
    engines/asylum/resources/actor.cpp


diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp
index 9fb71ecbc1..a64881cc5d 100644
--- a/engines/asylum/resources/actor.cpp
+++ b/engines/asylum/resources/actor.cpp
@@ -2202,8 +2202,8 @@ void Actor::updateStatusEnabled() {
 	_frameIndex = (_frameIndex + 1) % _frameCount;
 
 	if (_vm->screenUpdateCount - _lastScreenUpdate > 300) {
-		// All actors except Crow
-		if (strcmp((char *)&_name, "Crow")) {
+		// All actors except Crow and Armed Max
+		if (strcmp((char *)&_name, "Crow") && strcmp((char *)_name, "Armed Max")) {
 			if (_vm->getRandom(100) < 50
 			 && (!getSpeech()->getSoundResourceId() || !getSound()->isPlaying(getSpeech()->getSoundResourceId()))
 			 && isDefaultDirection(10))