[Scummvm-cvs-logs] scummvm master -> a7bd346f2d7d0dcd71050daba1be01716b19eb44

criezy criezy at scummvm.org
Mon May 30 23:52:10 CEST 2016


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

Summary:
a7bd346f2d GNAP: Simplify transparency handling on BE systems


Commit: a7bd346f2d7d0dcd71050daba1be01716b19eb44
    https://github.com/scummvm/scummvm/commit/a7bd346f2d7d0dcd71050daba1be01716b19eb44
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-05-30T22:51:45+01:00

Commit Message:
GNAP: Simplify transparency handling on BE systems

Changed paths:
    engines/gnap/gamesys.cpp



diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp
index f56974f..d31854d 100644
--- a/engines/gnap/gamesys.cpp
+++ b/engines/gnap/gamesys.cpp
@@ -249,11 +249,7 @@ void GameSys::drawSpriteToBackground(int x, int y, int resourceId) {
 Graphics::Surface *GameSys::allocSurface(int width, int height) {
 	Graphics::Surface *surface = new Graphics::Surface();
 	surface->create(width, height, _backgroundSurface->format);
-#if defined(SCUMM_BIG_ENDIAN)
-	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0x00FFFFFF);
-#else
 	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0xFFFFFF00);
-#endif
 	return surface;
 }
 
@@ -646,9 +642,9 @@ void GameSys::blitSurface32(Graphics::Surface *destSurface, int x, int y, Graphi
 		byte *rsrc = src;
 		byte *rdst = dst;
 		for (int xc = 0; xc < width; ++xc) {
-			uint32 pixel = READ_LE_UINT32(rsrc);
+			uint32 pixel = READ_UINT32(rsrc);
 			if (!transparent || pixel != 0xFFFFFF00)
-				WRITE_LE_UINT32(rdst, pixel);
+				WRITE_UINT32(rdst, pixel);
 			rsrc += 4;
 			rdst += 4;
 		}






More information about the Scummvm-git-logs mailing list