[Scummvm-git-logs] scummvm master -> 2d88a308037a2025e38bc588b85a86927ff82fa2

[criezy]

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:
9d61d70c0d PLUMBERS: Remove unstable flag and enable by default
2d88a30803 Revert "SDL: Use RLE acceleration for SDL2 transparent surfaces"


Commit: 9d61d70c0d51bbc4ec75051f40ef57e9b0d2622d
    https://github.com/scummvm/scummvm/commit/9d61d70c0d51bbc4ec75051f40ef57e9b0d2622d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-11-26T01:56:48Z

Commit Message:
PLUMBERS: Remove unstable flag and enable by default

Changed paths:
    engines/plumbers/configure.engine
    engines/plumbers/detection.cpp


diff --git a/engines/plumbers/configure.engine b/engines/plumbers/configure.engine
index 948a0e7..32e0894 100644
--- a/engines/plumbers/configure.engine
+++ b/engines/plumbers/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 plumbers "Plumbers Don't Wear Ties" no "" "" ""
+add_engine plumbers "Plumbers Don't Wear Ties" yes "" "" ""
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 9c1fe49..38c26dd 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -48,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("GAME.BIN", 0, 41622),
 		Common::EN_ANY,
 		Common::kPlatformWindows,
-		ADGF_UNSTABLE,
+		ADGF_NO_FLAGS,
 		GUIO1(GUIO_NONE)
 	},
 


Commit: 2d88a308037a2025e38bc588b85a86927ff82fa2
    https://github.com/scummvm/scummvm/commit/2d88a308037a2025e38bc588b85a86927ff82fa2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-11-26T01:56:48Z

Commit Message:
Revert "SDL: Use RLE acceleration for SDL2 transparent surfaces"

This reverts commit 6b4195a542083c97f696c843b9823d578b018996.
There seemed to be no clear benefit in using RLE for transparent
surfaces, and there were a few reports that it might cause crashes
on Windows. So to be on the safe side I prefer to revert this
commit.

Changed paths:
    backends/platform/sdl/sdl.cpp


diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 68a987b..f6ab180 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -765,13 +765,10 @@ int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha) {
 		if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE)) {
 			return -1;
 		}
-		SDL_SetSurfaceRLE(surface, 0);
 	} else {
 		if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND)) {
 			return -1;
 		}
-		if (flag & SDL_RLEACCEL)
-			SDL_SetSurfaceRLE(surface, 1);
 	}
 
 	return 0;
@@ -779,13 +776,7 @@ int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha) {
 
 #undef SDL_SetColorKey
 int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) {
-	if (SDL_SetColorKey(surface, SDL_TRUE, key)) {
-		return -1;
-	}
-
-	if (flag & SDL_RLEACCEL)
-		SDL_SetSurfaceRLE(surface, 1);
-	return 0;
+	return SDL_SetColorKey(surface, SDL_TRUE, key) ? -1 : 0;
 }
 #endif