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

[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:
b5cf66eb86 SCUMM HE: Fix compilation with disabled 16bit color


Commit: b5cf66eb865d579560370c705911994109b5e5a5
    https://github.com/scummvm/scummvm/commit/b5cf66eb865d579560370c705911994109b5e5a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-30T22:35:24+02:00

Commit Message:
SCUMM HE: Fix compilation with disabled 16bit color

Changed paths:
    engines/scumm/he/wiz_he.cpp



diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 5b844e2..60eb859 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1643,6 +1643,8 @@ void Wiz::drawWizImageEx(uint8 *dst, uint8 *dataPtr, uint8 *maskPtr, int dstPitc
 	}
 }
 
+#ifdef USE_RGB_COLOR
+
 void Wiz::copyCompositeWizImage(uint8 *dst, uint8 *wizPtr, uint8 *compositeInfoBlockPtr, uint8 *maskPtr, int dstPitch, int dstType,
 		int dstw, int dsth, int srcx, int srcy, int srcw, int srch, int state, const Common::Rect *clipBox,
 		int flags, const uint8 *palPtr, int transColor, uint8 bitDepth, const uint8 *xmapPtr, uint16 conditionBits) {
@@ -1802,6 +1804,8 @@ void Wiz::copyT14WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
 	warning("T14: params %d", nROPParam);
 }
 
+#endif
+
 struct PolygonDrawData {
 	struct PolygonArea {
 		int32 xmin;