[Scummvm-git-logs] scummvm master -> 145ab27df9b83457f3f5e7808ffad59464093609

[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:
6878047715 ASYLUM: allow returning to game when using 'scene' debug command
7b6426721c ASYLUM: add missing config defaults
145ab27df9 ASYLUM: fix playing ambient sounds


Commit: 687804771538319e1a49c1800c45a01da2561d4d
    https://github.com/scummvm/scummvm/commit/687804771538319e1a49c1800c45a01da2561d4d
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-21T16:21:41+03:00

Commit Message:
ASYLUM: allow returning to game when using 'scene' debug command

Changed paths:
    engines/asylum/console.cpp


diff --git a/engines/asylum/console.cpp b/engines/asylum/console.cpp
index 3164f8ec98..b799488dd9 100644
--- a/engines/asylum/console.cpp
+++ b/engines/asylum/console.cpp
@@ -39,6 +39,7 @@
 #include "asylum/system/text.h"
 
 #include "asylum/views/insertdisc.h"
+#include "asylum/views/menu.h"
 #include "asylum/views/scene.h"
 #include "asylum/views/video.h"
 
@@ -774,6 +775,8 @@ bool Console::cmdChangeScene(int argc, const char **argv) {
 	_vm->_puzzles->reset();
 	_vm->resetFlags();
 
+	getMenu()->setGameStarted();
+
 	return false;
 }
 


Commit: 7b6426721c39bc1819217f762a1651c5f7a30d5f
    https://github.com/scummvm/scummvm/commit/7b6426721c39bc1819217f762a1651c5f7a30d5f
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-21T16:21:42+03:00

Commit Message:
ASYLUM: add missing config defaults

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


diff --git a/engines/asylum/system/config.cpp b/engines/asylum/system/config.cpp
index e88eab9c16..ecf2db0bbd 100644
--- a/engines/asylum/system/config.cpp
+++ b/engines/asylum/system/config.cpp
@@ -41,7 +41,11 @@ ConfigurationManager::ConfigurationManager() {
 	ConfMan.registerDefault("show_encounter_subtitles", true);
 	ConfMan.registerDefault("gamma_level", 0);
 	ConfMan.registerDefault("ambient_volume", -2000);
-	ConfMan.registerDefault("movie_volume", -1500);
+	ConfMan.registerDefault("movie_volume",    -500);
+	ConfMan.registerDefault("music_volume",   -1500);
+	ConfMan.registerDefault("sfx_volume",     -1000);
+	ConfMan.registerDefault("speech_volume",   -750);
+
 	ConfMan.registerDefault("music_status", true);
 	ConfMan.registerDefault("reverse_stereo", false);
 	ConfMan.registerDefault("performance", 4);


Commit: 145ab27df9b83457f3f5e7808ffad59464093609
    https://github.com/scummvm/scummvm/commit/145ab27df9b83457f3f5e7808ffad59464093609
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-21T16:21:42+03:00

Commit Message:
ASYLUM: fix playing ambient sounds

Changed paths:
    engines/asylum/views/scene.cpp


diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp
index d67e0fa2ca..1caa4a229d 100644
--- a/engines/asylum/views/scene.cpp
+++ b/engines/asylum/views/scene.cpp
@@ -840,6 +840,10 @@ void Scene::updateAmbientSounds() {
 
 		for (int32 f = 0; f < 6; f++) {
 			int32 gameFlag = snd->flagNum[f];
+
+			if (!gameFlag)
+				break;
+
 			if (gameFlag == 99999)
 				continue;
 
@@ -855,6 +859,7 @@ void Scene::updateAmbientSounds() {
 				}
 			}
 		}
+
 		if (processSound) {
 			if (_vm->sound()->isPlaying(snd->resourceId)) {
 
@@ -894,9 +899,6 @@ void Scene::updateAmbientSounds() {
 						} else {
 							int32 tmpVol = volume + (int32)_vm->getRandom(500) * ((_vm->getRandom(100) >= 50) ? -1 : 1);
 
-							if (tmpVol <= -10000)
-								tmpVol = -10000;
-
 							if (tmpVol >= 0)
 								tmpVol = 0;
 							else if (tmpVol <= -10000)
@@ -906,7 +908,7 @@ void Scene::updateAmbientSounds() {
 						}
 					}
 				} else if (LOBYTE(snd->flags) & 4) {
-					if (ambientTick > _vm->getTick()) {
+					if (ambientTick < _vm->getTick()) {
 						if (snd->nextTick >= 0)
 							getSharedData()->setAmbientTick(i, (uint32)((int32)_vm->getTick() + snd->nextTick * 60000));
 						else