[Scummvm-git-logs] scummvm master -> abc56853eb8b5a4029118f552867d4e78d19c82a

alxpnv a04198622 at gmail.com
Mon Jun 7 12:28:36 UTC 2021


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:
abc56853eb ASYLUM: fix a race in UpdateActor opcode


Commit: abc56853eb8b5a4029118f552867d4e78d19c82a
    https://github.com/scummvm/scummvm/commit/abc56853eb8b5a4029118f552867d4e78d19c82a
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-06-07T15:29:29+03:00

Commit Message:
ASYLUM: fix a race in UpdateActor opcode

This unblocks the odd state in Chapter 3 found by digitall

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


diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp
index b9dd8e9e70..12a09fab41 100644
--- a/engines/asylum/resources/script.cpp
+++ b/engines/asylum/resources/script.cpp
@@ -972,6 +972,10 @@ IMPLEMENT_OPCODE(UpdateActor)
 			_processNextEntry = true;
 			return;
 
+		case kActorStatusEnabled:
+		case kActorStatusEnabled2:
+			return;
+
 		case kActorStatusPickupItem:
 			actor->enable();
 			break;




More information about the Scummvm-git-logs mailing list