[Scummvm-git-logs] scummvm master -> 17b2d0320aa184e541620b9bd88a675008453a20

[alxpnv]

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:
17b2d0320a ASYLUM: fix re-assigning actor mask when using 'scene' command


Commit: 17b2d0320aa184e541620b9bd88a675008453a20
    https://github.com/scummvm/scummvm/commit/17b2d0320aa184e541620b9bd88a675008453a20
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-15T15:02:35+03:00

Commit Message:
ASYLUM: fix re-assigning actor mask when using 'scene' command

Changed paths:
    engines/asylum/asylum.cpp
    engines/asylum/console.cpp


diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index 378ef2ff05..f56d96135f 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -484,6 +484,8 @@ void AsylumEngine::processDelayedEvents() {
 		_sound->stopMusic();
 		_sound->stopAll();
 
+		resetFlags();
+
 		// Switch the scene
 		switchScene(sceneIndex);
 	}
diff --git a/engines/asylum/console.cpp b/engines/asylum/console.cpp
index e60ade7a6b..a4729e9273 100644
--- a/engines/asylum/console.cpp
+++ b/engines/asylum/console.cpp
@@ -773,7 +773,6 @@ bool Console::cmdChangeScene(int argc, const char **argv) {
 
 	_vm->_delayedSceneIndex = index;
 	_vm->_puzzles->reset();
-	_vm->resetFlags();
 
 	getMenu()->setGameStarted();