[Scummvm-git-logs] scummvm master -> b8a98a3a47dd8c7a52748cd87497b44ccc0a959e
tag2015
noreply at scummvm.org
Thu Jan 19 16:04:50 UTC 2023
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2f817634af AGS: Check sound sample rate before playing
0f476ddd40 AGS: Add english macro for NOLAUNCHLOAD detection entries
b8a98a3a47 AGS: Add/update detection for a few games
Commit: 2f817634afec7e73834f91c746428f8d3e7232e6
https://github.com/scummvm/scummvm/commit/2f817634afec7e73834f91c746428f8d3e7232e6
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-01-19T16:58:23+01:00
Commit Message:
AGS: Check sound sample rate before playing
Before playing a sound clip, check that the sample rate is acceptable for the sound system.
This avoids a crash to debugger in "The Excavation of Hob's
Barrow" which contains a sound effect that gets detected
at an incorrectly high sample rate.
Changed paths:
engines/ags/engine/media/audio/sound_clip.cpp
diff --git a/engines/ags/engine/media/audio/sound_clip.cpp b/engines/ags/engine/media/audio/sound_clip.cpp
index 53fdc7022cf..e14604a75d5 100644
--- a/engines/ags/engine/media/audio/sound_clip.cpp
+++ b/engines/ags/engine/media/audio/sound_clip.cpp
@@ -147,8 +147,11 @@ void SoundClipWaveBase::poll() {
int SoundClipWaveBase::play() {
if (_soundType != Audio::Mixer::kPlainSoundType) {
- _mixer->playStream(_soundType, &_soundHandle, _stream,
- -1, _vol255, 0, DisposeAfterUse::NO);
+ if (_stream->getRate() < 131072) // maximum accepted value in audio/rate.cpp
+ _mixer->playStream(_soundType, &_soundHandle, _stream,
+ -1, _vol255, 0, DisposeAfterUse::NO);
+ else
+ warning("Invalid sound clip sample ratio: %d! Skipping", _stream->getRate());
} else {
_waitingToPlay = true;
}
Commit: 0f476ddd409703135895f67b3cac6e6e6ddc7ea0
https://github.com/scummvm/scummvm/commit/0f476ddd409703135895f67b3cac6e6e6ddc7ea0
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-01-19T16:58:24+01:00
Commit Message:
AGS: Add english macro for NOLAUNCHLOAD detection entries
Changed paths:
engines/ags/detection_tables.h
diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 662cdaf57ba..9301d6f8372 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -3249,9 +3249,15 @@ const char *const PRE_25 = "Pre 2.5";
#define GAME_ENTRY_PLUGIN_STEAM_NOLAUNCHLOAD(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
STABLE_ENTRY_PLUGIN_GUIO(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Steam", GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), PLUGIN_ARR)
+#define GAME_ENTRY_PLUGIN_STEAM_EN_NOLAUNCHLOAD(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
+STABLE_ENTRY_PLUGIN_GUIO(ID, FILENAME, MD5, SIZE, Common::EN_ANY, "Steam", GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), PLUGIN_ARR)
+
#define GAME_ENTRY_PLUGIN_GOG_NOLAUNCHLOAD(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
STABLE_ENTRY_PLUGIN_GUIO(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "GOG.com", GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), PLUGIN_ARR)
+#define GAME_ENTRY_PLUGIN_GOG_EN_NOLAUNCHLOAD(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
+STABLE_ENTRY_PLUGIN_GUIO(ID, FILENAME, MD5, SIZE, Common::EN_ANY, "GOG.com", GUIO2(GUIO_NOLANG, GUIO_NOLAUNCHLOAD), PLUGIN_ARR)
+
static const PluginVersion AGSTEAM_WADJETEYE[] = { { "agsteam", kWadjetEye }, { nullptr, 0 } };
static const PluginVersion AGS_FLASHLIGHT[] = { { "agsflashlight", 0 }, { nullptr, 0 } };
static const PluginVersion AGSSPRITEFONT_CLIFFTOP[] = { { "agsspritefont", kClifftopGames }, { "agsplugin.spritefont", kClifftopGames }, { nullptr, 0 } };
Commit: b8a98a3a47dd8c7a52748cd87497b44ccc0a959e
https://github.com/scummvm/scummvm/commit/b8a98a3a47dd8c7a52748cd87497b44ccc0a959e
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-01-19T16:58:24+01:00
Commit Message:
AGS: Add/update detection for a few games
Changed paths:
engines/ags/detection_tables.h
diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 9301d6f8372..8c5083e65e6 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -1262,6 +1262,7 @@ const PlainGameDescriptor GAME_NAMES[] = {
{ "goosequest1", "Goose Quest 1" },
{ "gotalight", "Got a Light?" },
{ "gpslostadventure", "G.P.'s Lost Adventure" },
+ { "grandadvest", "Grandad and The Quest for The Holey Vest" },
{ "grandkitchenescape", "Grand Kitchen Escape" },
{ "granville1", "The Granville Chronicles - Part 1: The Rebellion Begins" },
{ "graveyard", "Graveyard" },
@@ -3013,6 +3014,7 @@ const PlainGameDescriptor GAME_NAMES[] = {
{ "vexationisland", "Vexation Island - The Game" },
{ "vicwreckleshalloweencostume", "Vic Wreckle's Halloween Costume" },
{ "vikingguardsman", "The Viking Guardsman" },
+ { "villard", "Villard Must Fall!" },
{ "virmachina", "VIRMACHINA" },
{ "virtualpiano", "Virtual Piano" },
{ "vivarium", "Vivarium" },
@@ -3552,6 +3554,8 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_STEAM("ashinaredwitch", "ATRW.exe", "7a24f662d686135f73c844231a5287bc", 51056669), // v1.1 (rollback 0.1)
GAME_ENTRY_STEAM("ashinaredwitch", "ATRW.exe", "7a24f662d686135f73c844231a5287bc", 51089445), // v1.2
GAME_ENTRY_STEAM("ashinaredwitch", "ATRW.exe", "7a24f662d686135f73c844231a5287bc", 51063519), // v1.3 updated
+ GAME_ENTRY_STEAM("ashinaredwitch", "ATRW.exe", "7a24f662d686135f73c844231a5287bc", 54145006), // v2.0? (rollback 0.2)
+ GAME_ENTRY_STEAM("ashinaredwitch", "ATRW.exe", "7a24f662d686135f73c844231a5287bc", 54144779), // v2.0 updated
GAME_ENTRY_EN_STEAM("astroloco", "astroloco1.exe", "c71919e3b0cc415ef725cf1a9818a515", 42894919),
GAME_ENTRY_EN("astroloco", "astroloco1.exe", "06e70a826fde73b3f86f974885d31abe", 42492070),
GAME_ENTRY_EN_STEAM("beer", "beer!.exe", "6f201fd7a19869c85f49c7c471d0479a", 5055091), // Windows
@@ -3648,8 +3652,9 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_STEAM("downfall2016", "Downfall.ags", "7c87b99ce309a46085e40ac1a2b20e75", 224024207), // Linux
GAME_ENTRY_EN_STEAM("dustbowl", "dustbowl.exe", "aa349d52fd620cf9642935cd5bdec5d8", 63365026),
GAME_ENTRY_EN("dustbowl", "dustbowl.exe", "aa349d52fd620cf9642935cd5bdec5d8", 82185295),
- GAME_ENTRY_PLUGIN_STEAM_NOLAUNCHLOAD("excavationhb", "ac2game.dat", "e5553f7c45d26d5fbc8b376a859bb87c", 563281442, AGSSPRITEFONT_CLIFFTOP), // Mac
- GAME_ENTRY_PLUGIN_GOG_NOLAUNCHLOAD("excavationhb", "TEOHB.exe", "f176b46bc89e227f745dae9878171676", 566320586, AGSSPRITEFONT_CLIFFTOP),
+ GAME_ENTRY_PLUGIN_STEAM_EN_NOLAUNCHLOAD("excavationhb", "ac2game.dat", "e5553f7c45d26d5fbc8b376a859bb87c", 563281442, AGSSPRITEFONT_CLIFFTOP), // Mac
+ GAME_ENTRY_PLUGIN_GOG_EN_NOLAUNCHLOAD("excavationhb", "TEOHB.exe", "f176b46bc89e227f745dae9878171676", 566320586, AGSSPRITEFONT_CLIFFTOP),
+ GAME_ENTRY_PLUGIN_GOG_EN_NOLAUNCHLOAD("excavationhb", "TEOHB.exe", "f176b46bc89e227f745dae9878171676", 566323443, AGSSPRITEFONT_CLIFFTOP), // Win 1.05
GAME_ENTRY_STEAM("falconcity", "game.exe", "e816b31cfe3512c2ec24ac0bc6cfc605", 584191058), // Eng-Hun-Chi
GAME_ENTRY_EN_STEAM("feriadarles", "feria d'arles.exe", "6a3291595263debd129e1e2064baeea5", 275649462),
GAME_ENTRY_EN_STEAM("feriadarles", "ac2game.dat", "6a3291595263debd129e1e2064baeea5", 275640157), // Mac
@@ -4348,6 +4353,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
DEMO_ENTRY_LANG("tsomi2", "The Secret of Monkey Island 2.exe", "3b7cceb3e4bdb031dc5d8f290936e94b", 5075308, Common::ES_ESP),
DEMO_ENTRY_EN("updatequest", "U-Quest.exe", "06a03fe35791b0578068ab1873455463", 1776804),
DEMO_ENTRY_EN("valis", "valis 0.70.exe", "0710e2ec71042617f565c01824f0cf3c", 4348394),
+ DEMO_ENTRY_LANG("villard", "VMF_DEMO 2.0.1.exe", "534f936a0fac0c6f72b6ce6aaa6c9ce2", 653406938, Common::IT_ITA),
DEMO_ENTRY_LANG("vohaulsrevenge2", "SQ XII.exe", "465f972675db2da6040518221af5b0ba", 17313307, Common::RU_RUS),
DEMO_ENTRY_EN("wallyweasel", "wallydemo.exe", "95b7dd55f6e15c8a2118856ed9fe8ff9", 12579444),
DEMO_ENTRY_EN("waitingfortheloop", "WaitingForTheLoopDemo.exe", "0241777c2537fc5d077c05cde10bfa9f", 48581712),
@@ -5390,6 +5396,8 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_EN("gotalight", "gotalight.exe", "daa21f03e41b5d3e7fd7558be3f8616e", 4019593),
GAME_ENTRY_EN("gpslostadventure", "G.P.s Lost Adventure [Wells8892].exe", "06a03fe35791b0578068ab1873455463", 4181945),
GAME_ENTRY_EN("gpslostadventure", "GPs_LostAdventure.exe", "06a03fe35791b0578068ab1873455463", 4181945),
+ GAME_ENTRY_EN("grandadvest", "GrandadVest.exe", "8d1ff95c16500befbdc72260d461d73f", 20824973), // Windows
+ GAME_ENTRY_EN("grandadvest", "GrandadVest.ags", "cd8d065607f8e9dbed2e7329d57e445a", 17716089), // Linux
GAME_ENTRY_EN("grandkitchenescape", "GrandKitchenEscape.exe", "310db16c989e9bbfa3973bc1bb6215f7", 28327560), // Windows
GAME_ENTRY_EN("grandkitchenescape", "GrandKitchenEscape.ags", "5d2aac79e25a74a4db113c54df4a01ec", 25110132), // Linux
GAME_ENTRY_EN("granville1", "GVILLE1.exe", "c1451c6631e1bf4de6d1ed3760ca1dc9", 2340624),
More information about the Scummvm-git-logs
mailing list