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

AndywinXp noreply at scummvm.org
Sun May 19 18:26:56 UTC 2024


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:
e18e0a4da1 SCUMM: DIG: Fix CTRL-B easter egg not working


Commit: e18e0a4da1dd291ea51b87c9e0c00f87bc20b27b
    https://github.com/scummvm/scummvm/commit/e18e0a4da1dd291ea51b87c9e0c00f87bc20b27b
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-05-19T20:26:50+02:00

Commit Message:
SCUMM: DIG: Fix CTRL-B easter egg not working

This fixes #15064. The CTRL-B combination was used in COMI to
regulate the buffer count for iMUSE, so I originally decided to extend
it to SCUMM v7 games. Unfortunately DIG uses this combination for
an easter egg, so the iMUSE buffer function is now available through
SHIFT-B for this game.

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 28c1938b89d..fe07fc49502 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -547,7 +547,7 @@ void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
 void ScummEngine_v7::processKeyboard(Common::KeyState lastKeyHit) {
 	if (isUsingOriginalGUI()) {
 		if (lastKeyHit.keycode == Common::KEYCODE_b &&
-			(lastKeyHit.hasFlags(Common::KBD_CTRL) || lastKeyHit.hasFlags(Common::KBD_SHIFT))) {
+			((lastKeyHit.hasFlags(Common::KBD_CTRL) && _game.id != GID_DIG) || lastKeyHit.hasFlags(Common::KBD_SHIFT))) {
 			int curBufferCount = _imuseDigital->roundRobinSetBufferCount();
 			// "iMuse buffer count changed to %d"
 			showBannerAndPause(0, 90, getGUIString(gsIMuseBuffer), curBufferCount);




More information about the Scummvm-git-logs mailing list