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

[dreammaster]

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

Summary:
71a0a42ed0 AGS: Switch detection entries to stable
a86a7f649f AGS: Change error for surface drawing onto itself to a warning


Commit: 71a0a42ed08aa3b68cf360c4d5a72de82b4b7f54
    https://github.com/scummvm/scummvm/commit/71a0a42ed08aa3b68cf360c4d5a72de82b4b7f54
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-01T17:35:08-07:00

Commit Message:
AGS: Switch detection entries to stable

Changed paths:
    engines/ags/detection_tables.h


diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index f188217fb8..885adf33f8 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -1670,39 +1670,42 @@ const char *const PRE_25 = "Pre 2.5";
 #define TESTING_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM) \
 	DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, nullptr, ADGF_TESTING)
 
+#define STABLE_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM) \
+	DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, nullptr, ADGF_NO_FLAGS)
+
 #define DEMO_ENTRY(ID, FILENAME, MD5, SIZE) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Demo")
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Demo")
 
 #define DEMO_ENTRY_LANG(ID, FILENAME, MD5, SIZE, LANG) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, LANG, "Demo")
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, LANG, "Demo")
 
 #define GAME_ENTRY(ID, FILENAME, MD5, SIZE) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr)
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr)
 
 #define GAME_ENTRY_LANG(ID, FILENAME, MD5, SIZE, LANG) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, LANG, nullptr)
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, LANG, nullptr)
 
 #define GAME_ENTRY_STEAM(ID, FILENAME, MD5, SIZE) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Steam")
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Steam")
 
 #define GAME_ENTRY_GOG(ID, FILENAME, MD5, SIZE) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "GOG")
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "GOG")
 
 #define GAME_ENTRY_PLATFORM(ID, FILENAME, MD5, SIZE, PLATFORM) \
-	TESTING_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, PLATFORM)
+	STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, PLATFORM)
 
 
-#define TESTING_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR) \
-	DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR, ADGF_TESTING)
+#define STABLE_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR) \
+	DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR, ADGF_NO_FLAGS)
 
 #define DEMO_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
-	TESTING_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Demo", PLUGIN_ARR)
+	STABLE_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Demo", PLUGIN_ARR)
 
 #define GAME_ENTRY_PLUGIN_STEAM(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
-	TESTING_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Steam", PLUGIN_ARR)
+	STABLE_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Steam", PLUGIN_ARR)
 
 #define GAME_ENTRY_PLUGIN_GOG(ID, FILENAME, MD5, SIZE, PLUGIN_ARR) \
-	TESTING_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "GOG", PLUGIN_ARR)
+	STABLE_ENTRY_PLUGIN(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "GOG", PLUGIN_ARR)
 
 static const PluginVersion AGSTEAM_WADJETEYE[] = { { "agsteam", kWadjetEye }, { nullptr, 0 } };
 static const PluginVersion AGS_FLASHLIGHT[] = { { "agsflashlight", 0 }, { nullptr, 0 } };


Commit: a86a7f649fba53b3765a2bcc63c5a0da1e29d2c7
    https://github.com/scummvm/scummvm/commit/a86a7f649fba53b3765a2bcc63c5a0da1e29d2c7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-01T17:35:08-07:00

Commit Message:
AGS: Change error for surface drawing onto itself to a warning

Changed paths:
    engines/ags/engine/ac/drawing_surface.cpp


diff --git a/engines/ags/engine/ac/drawing_surface.cpp b/engines/ags/engine/ac/drawing_surface.cpp
index 8d082528f9..9545794849 100644
--- a/engines/ags/engine/ac/drawing_surface.cpp
+++ b/engines/ags/engine/ac/drawing_surface.cpp
@@ -125,8 +125,14 @@ void DrawingSurface_DrawImageImpl(ScriptDrawingSurface *sds, Bitmap *src,
 	int dst_x, int dst_y, int trans, int dst_width, int dst_height,
 	int src_x, int src_y, int src_width, int src_height, int sprite_id, bool src_has_alpha) {
 	Bitmap *ds = sds->GetBitmapSurface();
-	if (src == ds)
-		quit("!DrawingSurface.DrawImage: cannot draw onto itself");
+
+	// WORKAROUND: Strangeland triggers this error, so change to a warning
+	static bool shownWarning = false;
+	if (src == ds && !shownWarning) {
+		warning("!DrawingSurface.DrawImage: cannot draw onto itself");
+		shownWarning = true;
+	}
+
 	if ((trans < 0) || (trans > 100))
 		quit("!DrawingSurface.DrawImage: invalid transparency setting");