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

tag2015 noreply at scummvm.org
Mon May 5 20:23:45 UTC 2025


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

Summary:
fd1df13b7d AGS: Update AGSWaves plugin used in Strangeland
e8481dfb07 AGS: Update Strangeland entries


Commit: fd1df13b7dedf8ba2718fa22c6b695e74a98f5b1
    https://github.com/scummvm/scummvm/commit/fd1df13b7dedf8ba2718fa22c6b695e74a98f5b1
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2025-05-05T22:20:28+02:00

Commit Message:
AGS: Update AGSWaves plugin used in Strangeland

Changed paths:
    engines/ags/plugins/ags_waves/ags_waves.cpp
    engines/ags/plugins/ags_waves/sound.cpp


diff --git a/engines/ags/plugins/ags_waves/ags_waves.cpp b/engines/ags/plugins/ags_waves/ags_waves.cpp
index 20b39964d7a..c52e6998ab5 100644
--- a/engines/ags/plugins/ags_waves/ags_waves.cpp
+++ b/engines/ags/plugins/ags_waves/ags_waves.cpp
@@ -22,6 +22,7 @@
 #include "ags/plugins/ags_waves/ags_waves.h"
 #include "ags/plugins/serializer.h"
 #include "ags/ags.h"
+#include "ags/globals.h"
 
 namespace AGS3 {
 namespace Plugins {
@@ -47,21 +48,26 @@ void AGSWaves::AGS_EngineStartup(IAGSEngine *engine) {
 	Character_GetY = _engine->GetScriptFunctionAddress("Character::get_Y");
 	Character_ID = _engine->GetScriptFunctionAddress("Character::ID");
 
+	// Newer versions (after the 2025/04 update) no longer use the plugin to play sounds, so these
+	// bindings are not needed
+	if (_G(loaded_game_file_version) < 3060021) {
+		SCRIPT_METHOD(SFX_Play, AGSWaves::SFX_Play);
+		SCRIPT_METHOD(SFX_SetVolume, AGSWaves::SFX_SetVolume);
+		SCRIPT_METHOD(SFX_GetVolume, AGSWaves::SFX_GetVolume);
+		SCRIPT_METHOD(Music_Play, AGSWaves::Music_Play);
+		SCRIPT_METHOD(Music_GetVolume, AGSWaves::Music_GetVolume);
+		SCRIPT_METHOD(Music_SetVolume, AGSWaves::Music_SetVolume);
+		SCRIPT_METHOD(SFX_Stop, AGSWaves::SFX_Stop);
+		SCRIPT_METHOD(SFX_SetPosition, AGSWaves::SFX_SetPosition);
+		SCRIPT_METHOD(SFX_SetGlobalVolume, AGSWaves::SFX_SetGlobalVolume);
+		SCRIPT_METHOD(Load_SFX, AGSWaves::Load_SFX);
+		SCRIPT_METHOD(Audio_Apply_Filter, AGSWaves::Audio_Apply_Filter);
+		SCRIPT_METHOD(Audio_Remove_Filter, AGSWaves::Audio_Remove_Filter);
+		SCRIPT_METHOD(SFX_AllowOverlap, AGSWaves::SFX_AllowOverlap);
+		SCRIPT_METHOD(SFX_Filter, AGSWaves::SFX_Filter);
+	}
+
 	SCRIPT_METHOD(DrawScreenEffect, AGSWaves::DrawScreenEffect);
-	SCRIPT_METHOD(SFX_Play, AGSWaves::SFX_Play);
-	SCRIPT_METHOD(SFX_SetVolume, AGSWaves::SFX_SetVolume);
-	SCRIPT_METHOD(SFX_GetVolume, AGSWaves::SFX_GetVolume);
-	SCRIPT_METHOD(Music_Play, AGSWaves::Music_Play);
-	SCRIPT_METHOD(Music_GetVolume, AGSWaves::Music_GetVolume);
-	SCRIPT_METHOD(Music_SetVolume, AGSWaves::Music_SetVolume);
-	SCRIPT_METHOD(SFX_Stop, AGSWaves::SFX_Stop);
-	SCRIPT_METHOD(SFX_SetPosition, AGSWaves::SFX_SetPosition);
-	SCRIPT_METHOD(SFX_SetGlobalVolume, AGSWaves::SFX_SetGlobalVolume);
-	SCRIPT_METHOD(Load_SFX, AGSWaves::Load_SFX);
-	SCRIPT_METHOD(Audio_Apply_Filter, AGSWaves::Audio_Apply_Filter);
-	SCRIPT_METHOD(Audio_Remove_Filter, AGSWaves::Audio_Remove_Filter);
-	SCRIPT_METHOD(SFX_AllowOverlap, AGSWaves::SFX_AllowOverlap);
-	SCRIPT_METHOD(SFX_Filter, AGSWaves::SFX_Filter);
 	SCRIPT_METHOD(DrawBlur, AGSWaves::DrawBlur);
 	SCRIPT_METHOD(DrawTunnel, AGSWaves::DrawTunnel);
 	SCRIPT_METHOD(DrawCylinder, AGSWaves::DrawCylinder);
diff --git a/engines/ags/plugins/ags_waves/sound.cpp b/engines/ags/plugins/ags_waves/sound.cpp
index ef08c2fb3af..895fdd53f62 100644
--- a/engines/ags/plugins/ags_waves/sound.cpp
+++ b/engines/ags/plugins/ags_waves/sound.cpp
@@ -80,11 +80,6 @@ void AGSWaves::SFX_GetVolume(ScriptMethodParams &params) {
 }
 
 void AGSWaves::Music_Play(ScriptMethodParams &params) {
-	if (params.size() == 2) {
-		// TODO: Plugin changed in latest update, this will need to be reimplemented
-		debug(0, "AGSWaves::Music_Play not implemented in latest version");
-		return;
-	}
 	PARAMS6(int, MFX, int, repeat, int, fadeinMS, int, fadeoutMS, int, Position, bool, fixclick);
 	MusicPlay(MFX, repeat, fadeinMS, fadeoutMS, Position, false, fixclick);
 }


Commit: e8481dfb07f594422d59585e55b3b968494c887a
    https://github.com/scummvm/scummvm/commit/e8481dfb07f594422d59585e55b3b968494c887a
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2025-05-05T22:20:29+02:00

Commit Message:
AGS: Update Strangeland entries

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index c37884686f0..d7015101ae7 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -4958,6 +4958,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "151b0391a650d3c81c2758deaa5852cd", 3183277137, Common::EN_ANY, nullptr, GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0),
 	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "c5978d50a9b7ee1c8a50a731847d8504", 3186989657, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win v2.7
 	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "c5978d50a9b7ee1c8a50a731847d8504", 3187004936, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win v3.0
+	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "a20e9de4567f25b692c724d9783436ac", 3012885588, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win v3.2c
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "511e08ad31c4020a9ca01b6f7ce1365f", 3009634736, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "7e5abc5202098bd00ddef999854eb9ab", 3183368017, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "e4b9f0aa26c1115143ad483c99bc9383", 3183880236, Common::UNK_LANG, "GOG.com", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac v2.5a
@@ -4966,8 +4967,11 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
 	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "c5978d50a9b7ee1c8a50a731847d8504", 3186428869, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win 2.3
 	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "c5978d50a9b7ee1c8a50a731847d8504", 3187004654, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win-Linux v3.0
 	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "a20e9de4567f25b692c724d9783436ac", 3012885224, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win v3.2?
+	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.exe", "a20e9de4567f25b692c724d9783436ac", 3012885314, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Win v3.2c
+	DETECTION_ENTRY_GUIO("strangeland", "Strangeland.ags", "186db7411f5dd4b8996be8a47d3a15ea", 3009649966, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Linux v3.2c
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "e037ab3414dec971b90715c7dbb56f4c", 3183901914, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac
 	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "f82b54c827a6c77c9f3922f8d3c52565", 3183901922, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac
+	DETECTION_ENTRY_GUIO("strangeland", "ac2game.dat", "186db7411f5dd4b8996be8a47d3a15ea", 3009649966, Common::UNK_LANG, "Steam", GUIO3(GUIO_NOLANG, GUIO_NOLAUNCHLOAD, GAMEOPTION_NO_SAVELOAD), ADGF_NO_FLAGS, 0), // Mac v3.6
 	GAME_ENTRY("sulifallenharmony", "Suli Fallen Harmony.exe", "8a58836830dce896e4366f57791ab6cc", 35900870),  // v1.4 itch.io En-Fr
 	GAME_ENTRY_STEAM("sumatra", "sumatra fate of yandi.exe", "57c868b1a81c0335ab60970292cd79d8", 170088886),  // En-Fr-De-Es
 	GAME_ENTRY_STEAM("sumatra", "sumatra fate of yandi.exe", "b4407ac542f316456f549fc8a60dccae", 170634789),




More information about the Scummvm-git-logs mailing list