[Scummvm-git-logs] scummvm branch-2-9 -> 8c3eecfdeaa5ddc2045caa57979ba8f812699b5c

[dwatteau]

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:
18041f9625 TWP: Thimbleweed Park should not crash if shaders are not supported
8c3eecfdea TWP: Thimbleweed Park should not close ScummVM if shaders are not supported


Commit: 18041f9625cbfd1f2dec42da8e95b19b90a96c1e
    https://github.com/scummvm/scummvm/commit/18041f9625cbfd1f2dec42da8e95b19b90a96c1e
Author: scemino (scemino74 at gmail.com)
Date: 2025-04-30T14:50:54+02:00

Commit Message:
TWP: Thimbleweed Park should not crash if shaders are not supported

(cherry picked from commit fffc1feb52945792ac1aebac7c0e885df11c3283)

Changed paths:
    engines/twp/twp.cpp


diff --git a/engines/twp/twp.cpp b/engines/twp/twp.cpp
index cb53ec314f7..826b5d5fba6 100644
--- a/engines/twp/twp.cpp
+++ b/engines/twp/twp.cpp
@@ -1011,6 +1011,10 @@ Common::Error TwpEngine::run() {
 	const Common::String &gameTarget = ConfMan.getActiveDomainName();
 	AchMan.setActiveDomain(getMetaEngine()->getAchievementsInfo(gameTarget));
 
+	if (!g_system->hasFeature(OSystem::kFeatureShadersForGame)) {
+		error("Thimbleweed Park requires OpenGL with shaders");
+	}
+
 	initGraphics3d(SCREEN_WIDTH, SCREEN_HEIGHT);
 
 	// Set the engine's debugger console


Commit: 8c3eecfdeaa5ddc2045caa57979ba8f812699b5c
    https://github.com/scummvm/scummvm/commit/8c3eecfdeaa5ddc2045caa57979ba8f812699b5c
Author: scemino (scemino74 at gmail.com)
Date: 2025-04-30T14:50:55+02:00

Commit Message:
TWP: Thimbleweed Park should not close ScummVM if shaders are not supported

(cherry picked from commit 692eea97fa79f285f29af2de3b6d924e586a4786)

Changed paths:
    engines/twp/twp.cpp


diff --git a/engines/twp/twp.cpp b/engines/twp/twp.cpp
index 826b5d5fba6..31db06733ba 100644
--- a/engines/twp/twp.cpp
+++ b/engines/twp/twp.cpp
@@ -1012,7 +1012,7 @@ Common::Error TwpEngine::run() {
 	AchMan.setActiveDomain(getMetaEngine()->getAchievementsInfo(gameTarget));
 
 	if (!g_system->hasFeature(OSystem::kFeatureShadersForGame)) {
-		error("Thimbleweed Park requires OpenGL with shaders");
+		return Common::Error(Common::kUnknownError, "Thimbleweed Park requires OpenGL with shaders which is not supported on your system");
 	}
 
 	initGraphics3d(SCREEN_WIDTH, SCREEN_HEIGHT);