[Scummvm-git-logs] scummvm master -> 42d4a844be4b85823de928923491fe484454306f

[sev-]

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

Summary:
60b387ac76 AGDS: Specify engine components
9ffdd941c7 AGDS: Fix compilation when vorbis is not present
323d932561 AGDS: Fix compilation when freetype2 is not present
42d4a844be AGDS: Fix variable type disambiguity


Commit: 60b387ac769e28330c937b8251b8f0b4e61a1316
    https://github.com/scummvm/scummvm/commit/60b387ac769e28330c937b8251b8f0b4e61a1316
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-13T11:14:59+01:00

Commit Message:
AGDS: Specify engine components

Changed paths:
    engines/agds/configure.engine


diff --git a/engines/agds/configure.engine b/engines/agds/configure.engine
index 660ef5775ac..b6e83ab9b65 100644
--- a/engines/agds/configure.engine
+++ b/engines/agds/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine agds "AGDS (Black Mirror and NiBiRu)" no
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
+add_engine agds "AGDS (Black Mirror and NiBiRu)" no  "" "" "highres" "freetype2 vorbis"


Commit: 9ffdd941c7d1285433f010d682c14f23732dc702
    https://github.com/scummvm/scummvm/commit/9ffdd941c7d1285433f010d682c14f23732dc702
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-13T11:15:00+01:00

Commit Message:
AGDS: Fix compilation when vorbis is not present

Changed paths:
    engines/agds/soundManager.cpp


diff --git a/engines/agds/soundManager.cpp b/engines/agds/soundManager.cpp
index 28e5ab59169..f7e40c43d4c 100644
--- a/engines/agds/soundManager.cpp
+++ b/engines/agds/soundManager.cpp
@@ -137,7 +137,9 @@ int SoundManager::play(Common::String process, const Common::String &resource, c
 
 	Audio::SeekableAudioStream *stream = NULL;
 	if (lname.hasSuffix(".ogg")) {
+#ifdef USE_VORBIS
 		stream = Audio::makeVorbisStream(file.release(), DisposeAfterUse::YES);
+#endif
 	} else if (lname.hasSuffix(".wav")) {
 		stream = Audio::makeWAVStream(file.release(), DisposeAfterUse::YES);
 	}


Commit: 323d9325614593529c6ff3b055d61e14c8e405c9
    https://github.com/scummvm/scummvm/commit/323d9325614593529c6ff3b055d61e14c8e405c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-13T11:15:00+01:00

Commit Message:
AGDS: Fix compilation when freetype2 is not present

TODO: We need to either load a built-in fallback font or
prevent the game from launching

Changed paths:
    engines/agds/agds.cpp


diff --git a/engines/agds/agds.cpp b/engines/agds/agds.cpp
index 6b078c5248f..70c2c15b34d 100644
--- a/engines/agds/agds.cpp
+++ b/engines/agds/agds.cpp
@@ -919,7 +919,9 @@ Graphics::ManagedSurface *AGDSEngine::loadFromCache(int id) const {
 void AGDSEngine::loadFont(int id, const Common::String &name, int gw, int gh) {
 	if (v2()) {
 		debug("loadTTF %d %s, pixelSize: %d", id, name.c_str(), gh);
+#ifdef USE_FREETYPE2
 		_fonts[id].reset(Graphics::loadTTFFontFromArchive(name, gh));
+#endif
 	} else {
 		debug("loadFont %d %s %d %d", id, name.c_str(), gw, gh);
 		Graphics::ManagedSurface *surface = loadPicture(name);


Commit: 42d4a844be4b85823de928923491fe484454306f
    https://github.com/scummvm/scummvm/commit/42d4a844be4b85823de928923491fe484454306f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-13T11:15:00+01:00

Commit Message:
AGDS: Fix variable type disambiguity

Fixes compilation on NDS

Changed paths:
    engines/agds/process.cpp


diff --git a/engines/agds/process.cpp b/engines/agds/process.cpp
index 07c0850b186..86179780612 100644
--- a/engines/agds/process.cpp
+++ b/engines/agds/process.cpp
@@ -319,14 +319,14 @@ void Process::run() {
 
 #define UNARY_OP(NAME, OP)       \
 	void Process::NAME() {       \
-		int arg = pop();         \
+		int32 arg = pop();         \
 		debug(#NAME " %d", arg); \
 		push(OP arg);            \
 	}
 #define BINARY_OP(NAME, OP)                    \
 	void Process::NAME() {                     \
-		int arg2 = pop();                      \
-		int arg1 = pop();                      \
+		int32 arg2 = pop();                      \
+		int32 arg1 = pop();                      \
 		debug(" %d " #NAME " %d", arg1, arg2); \
 		push(arg1 OP arg2);                    \
 	}