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

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
7abfdcd3fc WAGE: Mark ashlandrevolution as demo as well
7af8104770 WAGE: Do not block inout on playing periodic sounds
fc7b7c6346 WAGE: Remove two non-WAGE games


Commit: 7abfdcd3fc84814026e0bbe76dc4091a424551a8
    https://github.com/scummvm/scummvm/commit/7abfdcd3fc84814026e0bbe76dc4091a424551a8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-28T19:44:02+02:00

Commit Message:
WAGE: Mark ashlandrevolution as demo as well

Fixes bug #16220

Changed paths:
    engines/wage/detection_tables.h


diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index e24744fba31..2d66ee884fe 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -86,7 +86,7 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAMEN("Alien Clutch", "Alien Clutch 2.0", "5c783f6b7f4a7d8d49e138be94e00f5a", 514976),
 	BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "57de8f1f79a24fa1a296aa10242c3648", 1842848),
 	FANGAMEN("The Adventures of Steve Reeve", "TAoSR", "e8b8ab3a838382125594aae17d53a4e7", 843323),
-	FANGAMEN("The Ashland Revolution", "Ashland 1.0", "f6ff38b24953ae818a000f88998e938d", 150220),
+	FANGAMEND("The Ashland Revolution", "Ashland 1.0", "f6ff38b24953ae818a000f88998e938d", 150220),
 	FANGAMEND("The Ashland Revolution", "xn--The Ashland Revolution Demo-uc9p", "18f1f5d1081b9a5676ccfb0c3b857059", 144767), // Original file name "The Ashland Revolution Demo†"
 	FANGAMEND("The Ashland Revolution", "Ashland Demo", "7a340e5ea03f7468717de408fb5b13fb", 149828), // alt version
 	FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "de6fdfe2b9d9efc0ea842e2bde68673a", 144753), // alt version


Commit: 7af8104770ec21d69e1eafad7340f3e1891c63fd
    https://github.com/scummvm/scummvm/commit/7af8104770ec21d69e1eafad7340f3e1891c63fd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-28T19:44:02+02:00

Commit Message:
WAGE: Do not block inout on playing periodic sounds

Fixes bug #16229

Changed paths:
    engines/wage/sound.cpp
    engines/wage/wage.cpp
    engines/wage/wage.h


diff --git a/engines/wage/sound.cpp b/engines/wage/sound.cpp
index 41fde3a462c..1b01613628d 100644
--- a/engines/wage/sound.cpp
+++ b/engines/wage/sound.cpp
@@ -80,7 +80,7 @@ Sound::~Sound() {
 	free(_data);
 }
 
-void WageEngine::playSound(Common::String soundName) {
+void WageEngine::playSound(Common::String soundName, bool blocking) {
 	soundName.toLowercase();
 
 	if (!_world->_sounds.contains(soundName)) {
@@ -95,7 +95,7 @@ void WageEngine::playSound(Common::String soundName) {
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, stream,
 		-1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
 
-	while (_mixer->isSoundHandleActive(_soundHandle) && !_shouldQuit) {
+	while (_mixer->isSoundHandleActive(_soundHandle) && !_shouldQuit && blocking) {
 		Common::Event event;
 
 		if (_eventMan->pollEvent(event)) {
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index e7deff5a006..4c664ed060c 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -174,7 +174,7 @@ Common::Error WageEngine::run() {
 		g_system->delayMillis(50);
 
 		if (!_soundToPlay.empty()) {
-			playSound(_soundToPlay);
+			playSound(_soundToPlay, false); // Do not block input
 			_soundToPlay.clear();
 		}
 	}
diff --git a/engines/wage/wage.h b/engines/wage/wage.h
index 1c371b89754..125ca1ae877 100644
--- a/engines/wage/wage.h
+++ b/engines/wage/wage.h
@@ -216,7 +216,7 @@ public:
 	Common::List<int> _soundQueue;
 	Common::String _soundToPlay;
 
-	void playSound(Common::String soundName);
+	void playSound(Common::String soundName, bool blocking = true);
 	void updateSoundTimerForScene(Scene *scene, bool firstTime);
 	void setMenu(Common::String soundName);
 	void appendText(const char *str);


Commit: fc7b7c6346140e4ce787091075ff3ae8e6c902ea
    https://github.com/scummvm/scummvm/commit/fc7b7c6346140e4ce787091075ff3ae8e6c902ea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-28T19:44:02+02:00

Commit Message:
WAGE: Remove two non-WAGE games

Those come from the same author but are built on a colored engine.
There are WAGE-based titles doubletrouble and tower with the same games

Fixes bug #16223

Changed paths:
    engines/wage/detection_tables.h


diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 2d66ee884fe..45d3b97d29a 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -113,7 +113,6 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Castle of Ert", "289d1f944d7c30b257587a7a49579d0f", 198713), // alt version
 	FANGAMEN("Castle of Ert", "Castle of Ert V1.2", "bc1c119b4a95ea6891a6e22c35e6c2d8", 201984),
 	FANGAMEN("City Adventure", "City Adventure 1.1", "0c9415ea525ffeedb346f7a62ebe6cd3", 285789),
-	FANGAME("Color by Number", "8fc77e5976ca25d05cf74db3ec3e5ef2", 528306),
 	FANGAME("Crystal Adventure", "d9e82fc3a58217a0ea4d6fddcb7fbc2a", 477918),
 	FANGAMEN("Crystal Search", "Crystal Search 1.5", "a9dda0422c6424e915363745ad2ecc41", 517019),
 	FANGAMEN("Dash Hansen and the Search for the Black Orchid", "Dash Hansen", "555e07344506720c8e4a29e1b5ba3578", 257129),
@@ -175,7 +174,6 @@ static const ADGameDescription gameDescriptions[] = {
 	BIGGAMED("grailquest", "Demo", "GrailQuest.demo", "c0ef30ef7e4119fe76c5fbe2f930e7b1", 190810),
 	FANGAME("Haikook", "405d383b273a0252645962e0e664be20", 419636),
 	FANGAME("Grendel-Dazz", "968addd863d8e5c90f73d029c9240ded", 267156),
-	FANGAME("Grey Tower", "02d0bb7a8c278d3789616129d47f15c1", 397248), // v1.5.2
 	FANGAMEN("Haunted House", "The haunted house 1.4", "655ff082160909beb83b99979cdfc2c6", 107959),
 	FANGAMEN("Haunted House", "Haunted House 1.5", "5e34e9fa13f4c90876f10a40ea1d1c79", 177244),
 	FANGAMEN("Haunted University", "Haunted U. v2.04", "d9511905bb908a0c3ea13c996e053aec", 1674435),