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

[neuromancer]

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:
aa04208e3b PRIVATE: implemented missing corner case in PoliceClip


Commit: aa04208e3b87342130357c57716d13aa450aa8e0
    https://github.com/scummvm/scummvm/commit/aa04208e3b87342130357c57716d13aa450aa8e0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-07-05T09:40:23+02:00

Commit Message:
PRIVATE: implemented missing corner case in PoliceClip

Changed paths:
    engines/private/funcs.cpp


diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index 28b8d66995..ba9e676e4f 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -640,8 +640,16 @@ static void fAMRadioClip(ArgArray args) {
 }
 
 static void fPoliceClip(ArgArray args) {
-	assert(args.size() <= 4);
+	assert(args.size() <= 4 || args.size() == 6);
 	fAddSound(args[0].u.str, "PoliceClip");
+	// In the original, the flag is triggered when the clip is played, but here we just change
+	// the flag when the clip is added to play. The effect for the played, is mostly the same.
+	if (args.size() == 6) {
+		assert(args[4].type == NAME);
+		assert(args[5].type == NUM);
+		Symbol *flag = g_private->maps.lookupVariable(args[4].u.sym->name);
+		setSymbol(flag, args[5].u.val);
+	}
 }
 
 static void fPhoneClip(ArgArray args) {