[Scummvm-git-logs] scummvm master -> 4258c6459115eccf965b17f4f2823c08f984dd56
AndywinXp
noreply at scummvm.org
Mon Oct 13 17:56:59 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4258c64591 SCUMM: HE: Add original GUI setting to HE60-62 games
Commit: 4258c6459115eccf965b17f4f2823c08f984dd56
https://github.com/scummvm/scummvm/commit/4258c6459115eccf965b17f4f2823c08f984dd56
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-10-13T19:56:53+02:00
Commit Message:
SCUMM: HE: Add original GUI setting to HE60-62 games
Changed paths:
engines/scumm/detection_tables.h
engines/scumm/input.cpp
engines/scumm/scumm.cpp
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 4deb7273769..93916efc104 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -234,22 +234,22 @@ static const GameSettings gameVariantsTable[] = {
{"comi", "Demo", 0, GID_CMI, 8, 0, MDT_NONE, GF_DEMO, Common::kPlatformWindows, GUIO6(GUIO_NOMIDI, GUIO_NOASPECT, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI, GAMEOPTION_LOWLATENCYAUDIO, GAMEOPTION_TTS)},
// Humongous Entertainment Scumm Version 6
- {"activity", "", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"funpack", 0, 0, GID_FUNPACK, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"fbpack", 0, 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
+ {"activity", "", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"funpack", 0, 0, GID_FUNPACK, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"fbpack", 0, 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
- {"brstorm", 0, 0, GID_FBEAR, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"fbear", "HE 62", 0, GID_FBEAR, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
+ {"brstorm", 0, 0, GID_FBEAR, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"fbear", "HE 62", 0, GID_FBEAR, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
{"fbear", "HE 70", 0, GID_FBEAR, 6, 70, MDT_NONE, GF_USE_KEY, Common::kPlatformWindows, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttmoon", "", 0, GID_PUTTMOON, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttmoon", "Demo", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
+ {"puttmoon", "", 0, GID_PUTTMOON, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"puttmoon", "Demo", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
{"puttmoon", "HE 70", 0, GID_PUTTMOON, 6, 70, MDT_NONE, GF_USE_KEY, Common::kPlatformWindows, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttputt", "HE 60", 0, GID_HEGAME, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttputt", "HE 61", 0, GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttputt", "HE 62", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
- {"puttputt", "Demo", 0, GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS)},
+ {"puttputt", "HE 60", 0, GID_HEGAME, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"puttputt", "HE 61", 0, GID_HEGAME, 6, 61, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"puttputt", "HE 62", 0, GID_HEGAME, 6, 62, MDT_ADLIB | MDT_MIDI, GF_USE_KEY | GF_HE_NO_BIDI, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
+ {"puttputt", "Demo", 0, GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_MIDI, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GAMEOPTION_AUDIO_OVERRIDE, GAMEOPTION_TTS, GAMEOPTION_ORIGINALGUI)},
// The following are meant to be generic HE game variants and as such do
// not specify a game ID. Make sure that these are last in the table, else
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 55af2d6d264..3c9fe79e4e3 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -714,7 +714,7 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
if (_game.version != 8 || (_game.version == 8 && (_game.features & GF_DEMO))) {
// "Music Volume Low ========= High"
- if (lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
+ if (_game.heversion == 0 && lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
(lastKeyHit.keycode == Common::KEYCODE_o || lastKeyHit.keycode == Common::KEYCODE_p)) {
Common::KeyState ks = lastKeyHit;
@@ -752,7 +752,7 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
}
// "Voice Volume Low ========= High"
- if (lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
+ if (_game.heversion == 0 && lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
(lastKeyHit.keycode == Common::KEYCODE_k || lastKeyHit.keycode == Common::KEYCODE_l)) {
Common::KeyState ks = lastKeyHit;
@@ -790,7 +790,7 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
}
// "Sfx Volume Low ========= High"
- if (lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
+ if (_game.heversion == 0 && lastKeyHit.hasFlags(Common::KBD_SHIFT) &&
(lastKeyHit.keycode == Common::KEYCODE_n || lastKeyHit.keycode == Common::KEYCODE_m)) {
Common::KeyState ks = lastKeyHit;
@@ -1003,7 +1003,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
if ((VAR_PAUSE_KEY != 0xFF && lastKeyHit.ascii == VAR(VAR_PAUSE_KEY)) ||
(lastKeyHit.keycode == Common::KEYCODE_SPACE && _game.features & GF_DEMO)) {
if (isSegaCD) {
- if (VAR(VAR_MAINMENU_KEY) != 0)
+ if (VAR(VAR_MAINMENU_KEY) != 0 && _game.heversion == 0)
showMainMenu();
return;
} else {
@@ -1200,7 +1200,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
}
if (VAR_MAINMENU_KEY != 0xFF && (lastKeyHit.ascii == VAR(VAR_MAINMENU_KEY) && lastKeyHit.hasFlags(0))
- && _game.version > 3) {
+ && _game.version > 3 && _game.heversion == 0) {
if (isSegaCD) {
// We map the GMM to F5, while SPACE (which acts as our pause button) calls the original menu...
openMainMenuDialog();
@@ -1274,8 +1274,8 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
return;
}
- if (_game.version == 6 && lastKeyHit.keycode == Common::KEYCODE_n && lastKeyHit.hasFlags(Common::KBD_CTRL)) {
- showBannerAndPause(0, 90, getGUIString(gsMouseMode));
+ if (_game.version == 6 && _game.heversion == 0 && lastKeyHit.keycode == Common::KEYCODE_n && lastKeyHit.hasFlags(Common::KBD_CTRL)) {
+ showBannerAndPause(0, 90, getGUIString(gsMouseMode));
return;
}
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 230a25e9d93..1030a7de407 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -4094,7 +4094,7 @@ bool ScummEngine::isUsingOriginalGUI() const {
if (_game.platform == Common::kPlatformPCEngine)
return false;
- if (_game.heversion != 0)
+ if (_game.heversion >= 70)
return false;
return _useOriginalGUI;
More information about the Scummvm-git-logs
mailing list