[Scummvm-git-logs] scummvm master -> 1068a9ee038a6a28e4f9cd05f39bf1e1942aec3a

[alxpnv]

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:
9473dfef9f ASYLUM: fix updating global flags
1068a9ee03 ASYLUM: make 'kill_script' use correct queue slot


Commit: 9473dfef9fe30a7b8e2f4996598d35f379ba8be4
    https://github.com/scummvm/scummvm/commit/9473dfef9fe30a7b8e2f4996598d35f379ba8be4
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-05-21T15:08:32+03:00

Commit Message:
ASYLUM: fix updating global flags

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


diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp
index 9b73879ad3..5f0ec7abdf 100644
--- a/engines/asylum/resources/script.cpp
+++ b/engines/asylum/resources/script.cpp
@@ -1895,17 +1895,22 @@ END_OPCODE
 //////////////////////////////////////////////////////////////////////////
 // Opcode 0x63
 IMPLEMENT_OPCODE(UpdateGlobalFlags)
+	if (!_vm->sound()->isPlaying(getSpeech()->getSoundResourceId())) {
+		if (cmd->param1) {
+			getSharedData()->setFlag(kFlag1, false);
+			getSharedData()->setFlag(kFlag2, false);
+		} else {
+			cmd->param1 = 1;
+		}
+
+		return;
+	}
+
 	if (cmd->param1) {
 		getSharedData()->setFlag(kFlag1, true);
 		getSharedData()->setFlag(kFlag2, true);
 	}
-
-	if (_vm->sound()->isPlaying(getSpeech()->getSoundResourceId())) {
-		_processNextEntry = true;
-		return;
-	} else if (!cmd->param1) {
-		cmd->param1 = 1;
-	}
+	_processNextEntry = true;
 END_OPCODE
 
 //////////////////////////////////////////////////////////////////////////


Commit: 1068a9ee038a6a28e4f9cd05f39bf1e1942aec3a
    https://github.com/scummvm/scummvm/commit/1068a9ee038a6a28e4f9cd05f39bf1e1942aec3a
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-05-21T15:08:32+03:00

Commit Message:
ASYLUM: make 'kill_script' use correct queue slot

Changed paths:
    engines/asylum/console.cpp


diff --git a/engines/asylum/console.cpp b/engines/asylum/console.cpp
index a26eb071b4..aeaa9740a7 100644
--- a/engines/asylum/console.cpp
+++ b/engines/asylum/console.cpp
@@ -651,9 +651,11 @@ bool Console::cmdKillScript(int argc, const char **argv) {
 	}
 
 	int32 index = atoi(argv[1]);
-
-	if (getScript()->isInQueue(index))
-		getScript()->removeFromQueue(index);
+	for (uint32 i = 0; i < ARRAYSIZE(getScript()->_queue.entries); i++)
+		if (getScript()->_queue.entries[i].scriptIndex == index) {
+			getScript()->removeFromQueue(i);
+			break;
+		}
 
 	return false;
 }