[Scummvm-git-logs] scummvm master -> a7182e2a6a0062e5f7e0a224e2aca63eb3733c66
sev-
sev at scummvm.org
Sat Nov 25 23:35:52 CET 2017
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:
a7182e2a6a SCUMM: Do not try to show original save/load screen in C64 demo
Commit: a7182e2a6a0062e5f7e0a224e2aca63eb3733c66
https://github.com/scummvm/scummvm/commit/a7182e2a6a0062e5f7e0a224e2aca63eb3733c66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-11-25T23:35:28+01:00
Commit Message:
SCUMM: Do not try to show original save/load screen in C64 demo
Fixes bug #10116
Changed paths:
engines/scumm/input.cpp
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 6ef7e4d..9c6ffe6 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -485,7 +485,7 @@ void ScummEngine_v2::processKeyboard(Common::KeyState lastKeyHit) {
// On Alt-F5 prepare savegame for the original save/load dialog.
if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.hasFlags(Common::KBD_ALT)) {
prepareSavegame();
- if (_game.id == GID_MANIAC && _game.version == 0) {
+ if (_game.id == GID_MANIAC && _game.version == 0 && !(_game.features & GF_DEMO)) {
runScript(2, 0, 0, 0);
}
if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformNES) {
More information about the Scummvm-git-logs
mailing list