[Scummvm-git-logs] scummvm master -> 06794e48c64c6856e4ab80d8923e85435926fd45
sev-
sev at scummvm.org
Tue Apr 20 22:57:47 UTC 2021
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fae8d3aa7f NEVERHOOD: Add detection entry for Japanese version. Bugreport #11074
570f1bcbc3 AGOS: Added another simon1 demo detection. Bugreport #11200
83efc45760 MADE: Added detection for rtz demo. Bugreport #11202
d7ea2efd3a NEWS: Mention new GUI option for SCUMM FM-TOWNS games
06794e48c6 BASE: Implemented --window-size command line option
Commit: fae8d3aa7fd89d6e4d68304ca0f90597e2f48d3d
https://github.com/scummvm/scummvm/commit/fae8d3aa7fd89d6e4d68304ca0f90597e2f48d3d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-21T00:57:31+02:00
Commit Message:
NEVERHOOD: Add detection entry for Japanese version. Bugreport #11074
Changed paths:
engines/neverhood/detection.cpp
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 2ff65ae65f..eb71903877 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -103,6 +103,18 @@ static const ADGameDescription gameDescriptions[] = {
GUIO1(GUIO_NONE)
},
+ // Neverhood Japanese version
+ // Bugreport #11074
+ {
+ "neverhood",
+ _s("Missing game code"), // Reason for being unsupported
+ AD_ENTRY1s("hd.blb", "c791725bbbc23c0f8bf78eece4555565", 4308928),
+ Common::RU_RUS,
+ Common::kPlatformWindows,
+ ADGF_DROPPLATFORM | ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NONE)
+ },
+
AD_TABLE_END_MARKER
};
Commit: 570f1bcbc35dc13b6a479b3111618a23be2e5e15
https://github.com/scummvm/scummvm/commit/570f1bcbc35dc13b6a479b3111618a23be2e5e15
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-21T00:57:31+02:00
Commit Message:
AGOS: Added another simon1 demo detection. Bugreport #11200
Changed paths:
engines/agos/detection_tables.h
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 2f6ee13325..e196a33302 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -1621,6 +1621,32 @@ static const AGOSGameDescription gameDescriptions[] = {
GF_TALKIE
},
+ // Simon the Sorcerer 1 - English DOS CD Demo from Zork Anthology CD
+ // Bugreport #11200
+ {
+ {
+ "simon1",
+ "CD Demo",
+
+ {
+ { "simon.gme", GAME_GMEFILE, "a8c91fe4f316b3e047d6782811eb1b70", 1236298},
+ { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", 30879},
+ { "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
+ { "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", 252},
+ { "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", 711},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_DEMO,
+ GUIO1(GUIO_NOSUBTITLES)
+ },
+
+ GType_SIMON1,
+ GID_SIMON1,
+ GF_TALKIE
+ },
+
// Simon the Sorcerer 1 - English DOS CD
{
{
Commit: 83efc45760bd6b5aa68707d4f599056e00c48f18
https://github.com/scummvm/scummvm/commit/83efc45760bd6b5aa68707d4f599056e00c48f18
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-21T00:57:31+02:00
Commit Message:
MADE: Added detection for rtz demo. Bugreport #11202
Changed paths:
engines/made/detection_tables.h
diff --git a/engines/made/detection_tables.h b/engines/made/detection_tables.h
index 4a74c4d8d7..ceed21c609 100644
--- a/engines/made/detection_tables.h
+++ b/engines/made/detection_tables.h
@@ -324,6 +324,24 @@ static const MadeGameDescription gameDescriptions[] = {
3,
},
+ {
+ // Return to Zork - Demo from Zork Anthology CD
+ // Bugreport #11202
+ {
+ "rtz",
+ "Demo",
+ AD_ENTRY1s("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2", 130683),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_DEMO,
+ GUIO0()
+ },
+ GID_RTZ,
+ 0,
+ GF_DEMO,
+ 3,
+ },
+
{
// Return to Zork - Japanese DOS
// This is the RTZCD.DAT in the base directory of the FM-Towns CD
Commit: d7ea2efd3ac1c8273d1e294bf80f463269e6a9b9
https://github.com/scummvm/scummvm/commit/d7ea2efd3ac1c8273d1e294bf80f463269e6a9b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-21T00:57:31+02:00
Commit Message:
NEWS: Mention new GUI option for SCUMM FM-TOWNS games
Changed paths:
NEWS.md
diff --git a/NEWS.md b/NEWS.md
index 1f5bfcb9a6..d5e3f28dab 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -89,7 +89,8 @@ For a more comprehensive changelog of the latest experimental code, see:
- Added support for Russobit-M versions of Pajama2 and SpyOzone.
- Fixed speech playback in Akella version of COMI.
- Added support for Discord and Humble Bundle versions of Indiana Jones and the Fate of Atlantis.
- - Added smooth scrolling for FM-Towns versions of games.
+ - Added smooth scrolling for FM-TOWNS versions of games.
+ - Added optional trimming to 200 pixels for some FM-TOWNS games, so aspect-ratio correction is possible.
Tinsel:
- Enabled the Return to Launcher feature.
Commit: 06794e48c64c6856e4ab80d8923e85435926fd45
https://github.com/scummvm/scummvm/commit/06794e48c64c6856e4ab80d8923e85435926fd45
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-21T00:57:31+02:00
Commit Message:
BASE: Implemented --window-size command line option
Changed paths:
NEWS.md
base/commandLine.cpp
base/main.cpp
diff --git a/NEWS.md b/NEWS.md
index d5e3f28dab..2bad26a57d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -32,6 +32,8 @@ For a more comprehensive changelog of the latest experimental code, see:
- Display path to scummvm configuration file in GUI -> Options -> Paths.
- Added new optional dependency, giflib >= 5.0.0. Used by some version of LBA.
- Added HiDPI support to the ScummVM GUI.
+ - Added command line option --window-size for specifying ScummVM window size,
+ applicable only to the OpenGL renderer.
AGOS:
- Added support for the Japanese PC-98 version of Elvira 1.
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index e1f8638b56..60ce532b2e 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -104,6 +104,10 @@ static const char HELP_STRING[] =
" --stretch-mode=MODE Select stretch mode (center, integral, fit, stretch)\n"
" --filtering Force filtered graphics mode\n"
" --no-filtering Force unfiltered graphics mode\n"
+#ifdef USE_OPENGL
+ " --window-size=W,H Set the ScummVM window size to the specified dimensions\n"
+ " (OpenGL only)\n"
+#endif
" --gui-theme=THEME Select GUI theme\n"
" --themepath=PATH Path to where GUI themes are stored\n"
" --list-themes Display list of all usable GUI themes\n"
@@ -607,6 +611,25 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
DO_LONG_OPTION_BOOL("filtering")
END_OPTION
+#ifdef USE_OPENGL
+ DO_LONG_OPTION("window-size")
+ Common::StringTokenizer tokenizer(option, ",");
+ if (tokenizer.empty())
+ usage("Invalid window format specified: %s", option);
+ Common::String w = tokenizer.nextToken();
+ if (tokenizer.empty())
+ usage("Invalid window format specified: %s", option);
+ Common::String h = tokenizer.nextToken();
+
+ if (atoi(w.c_str()) == 0 || atoi(h.c_str()) == 0)
+ usage("Invalid window format specified: %s", option);
+
+ settings["last_window_width"] = w;
+ settings["last_window_height"] = h;
+ settings.erase("window_size");
+ END_OPTION
+#endif
+
#ifdef ENABLE_EVENTRECORDER
DO_LONG_OPTION_INT("disable-display")
END_OPTION
diff --git a/base/main.cpp b/base/main.cpp
index 5ee1968fad..6a30a414ef 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -469,6 +469,12 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
ConfMan.registerDefault("dump_midi", true);
}
+#ifdef USE_OPENGL
+ if (settings.contains("last_window_width")) {
+ ConfMan.setInt("last_window_width", atoi(settings["last_window_width"].c_str()));
+ ConfMan.setInt("last_window_height", atoi(settings["last_window_height"].c_str()));
+ }
+#endif
// Init the backend. Must take place after all config data (including
// the command line params) was read.
More information about the Scummvm-git-logs
mailing list