[Scummvm-git-logs] scummvm master -> 879a06fabfb48f70ed5693ee1ceb8f88fa683c3e

[dreammaster]

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:
879a06fabf AGS: Extend workaround to fix QFG2 F4 cheat key


Commit: 879a06fabfb48f70ed5693ee1ceb8f88fa683c3e
    https://github.com/scummvm/scummvm/commit/879a06fabfb48f70ed5693ee1ceb8f88fa683c3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-04-08T19:08:02-07:00

Commit Message:
AGS: Extend workaround to fix QFG2 F4 cheat key

Changed paths:
    engines/ags/engine/script/cc_instance.cpp


diff --git a/engines/ags/engine/script/cc_instance.cpp b/engines/ags/engine/script/cc_instance.cpp
index f769f17f3c..eb0a3b8d30 100644
--- a/engines/ags/engine/script/cc_instance.cpp
+++ b/engines/ags/engine/script/cc_instance.cpp
@@ -1214,8 +1214,8 @@ int ccInstance::Run(int32_t curpc) {
 }
 
 ccInstance::WorkaroundResult ccInstance::checkForWorkaround(ScriptOperation &codeOp) {
-	if (pc == 0x72bab && codeOp.Instruction.Code == SCMD_CALLEXT &&
-			::AGS::g_vm->getGameId() == "qfg2agdi") {
+	if ((pc == 0x72bab || pc == 0x7365c) && codeOp.Instruction.Code == SCMD_CALLEXT
+			&& ::AGS::g_vm->getGameId() == "qfg2agdi") {
 		GUIMain &gui = _GP(guis)[2];
 		registers[SREG_AX] = gui.IsVisibleAndNotConcealed() ? 1 : 0;