[Scummvm-cvs-logs] scummvm master -> 2bf0ebf31733988a940dc31fa0bd2367dcd91e68

[sev-]

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:
2bf0ebf317 GRAPHICS: Add possibility to specify Fill maskmode in the constructor


Commit: 2bf0ebf31733988a940dc31fa0bd2367dcd91e68
    https://github.com/scummvm/scummvm/commit/2bf0ebf31733988a940dc31fa0bd2367dcd91e68
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-06-14T20:30:24+02:00

Commit Message:
GRAPHICS: Add possibility to specify Fill maskmode in the constructor

Changed paths:
    graphics/surface.cpp
    graphics/surface.h



diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index c5d4cf0..5f87965 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -498,7 +498,7 @@ Graphics::Surface *Surface::convertTo(const PixelFormat &dstFormat, const byte *
 	return surface;
 }
 
-FloodFill::FloodFill(Graphics::Surface *surface, uint32 oldColor, uint32 fillColor) {
+FloodFill::FloodFill(Graphics::Surface *surface, uint32 oldColor, uint32 fillColor, bool maskMode) {
 	_surface = surface;
 	_oldColor = oldColor;
 	_fillColor = fillColor;
@@ -506,7 +506,7 @@ FloodFill::FloodFill(Graphics::Surface *surface, uint32 oldColor, uint32 fillCol
 	_h = surface->h;
 
 	_mask = nullptr;
-	_maskMode = false;
+	_maskMode = maskMode;
 
 	_visited = (byte *)calloc(_w * _h, 1);
 }
diff --git a/graphics/surface.h b/graphics/surface.h
index 414a734..87c5f52 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -362,7 +362,7 @@ public:
 	 * @param oldColor Color on the surface to change
 	 * @param fillColor Color to fill with
 	 */
-	FloodFill(Surface *surface, uint32 oldColor, uint32 fillColor);
+	FloodFill(Surface *surface, uint32 oldColor, uint32 fillColor, bool maskMode = false);
 	~FloodFill();
 
 	/**