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

[sev-]

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:
c5c50a2a47 SCUMM: Clarify keyboard bindings in the Help. Bug #14740


Commit: c5c50a2a47b5a06a22249928fd36d1a35fcf82a7
    https://github.com/scummvm/scummvm/commit/c5c50a2a47b5a06a22249928fd36d1a35fcf82a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-11T01:39:38+01:00

Commit Message:
SCUMM: Clarify keyboard bindings in the Help. Bug #14740

This also removes displayed keybinding on on the memory usage,
since that is now taken by stretch functionality and in general,
this is not very useful as of now (it prints out one line of stats
to the debug log)

All of this should in reality go to the keymapper.

Changed paths:
    engines/scumm/help.cpp
    engines/scumm/resource.cpp


diff --git a/engines/scumm/help.cpp b/engines/scumm/help.cpp
index d805b0e25f5..780eefc6bb3 100644
--- a/engines/scumm/help.cpp
+++ b/engines/scumm/help.cpp
@@ -94,12 +94,11 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo
 	case 2:
 		title = _("Special keyboard commands:");
 		ADD_BIND("~, #", _("Show / Hide console"));
-		ADD_BIND(_("Ctrl") + U32String(" d"), _("Start the debugger"));
-		ADD_BIND(_("Ctrl") + U32String(" s"), _("Show memory consumption"));
+		ADD_BIND(_("Ctrl") + _("Alt") + U32String(" d"), _("Start the debugger"));
 		ADD_BIND(_("Ctrl") + U32String(" f"), _("Run in fast mode (*)"));
 		ADD_BIND(_("Ctrl") + U32String(" g"), _("Run in really fast mode (*)"));
 		ADD_BIND(_("Ctrl") + U32String(" m"), _("Toggle mouse capture"));
-		ADD_BIND(_("Ctrl") + U32String(" ") + _("Alt") + U32String(" 1-8"), _("Switch between graphics filters"));
+		ADD_BIND(_("Ctrl") + U32String(" ") + _("Alt") + U32String(" 9, 0"), _("Cycle between graphics filters"));
 		ADD_BIND(_("Ctrl") + U32String(" ") + _("Alt") + U32String(" +, -"), _("Increase / Decrease scale factor"));
 		ADD_BIND(_("Ctrl") + U32String(" ") + _("Alt") + U32String(" a"), _("Toggle aspect-ratio correction"));
 		ADD_LINE;
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 6a407963f99..7e97aa33534 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -1200,7 +1200,7 @@ void ResourceManager::resourceStats() {
 		}
 	}
 
-	debug(1, "Total allocated size=%d, locked=%d(%d)", _allocatedSize, lockedSize, lockedNum);
+	debug("Total allocated size=%d, locked=%d(%d)", _allocatedSize, lockedSize, lockedNum);
 }
 
 void ScummEngine_v5::readMAXS(int blockSize) {