From c6633404c9580aab1c312d8ad1adadcaf4797a8d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 22 Aug 2015 20:41:50 -0400
Subject: SHERLOCK: RT: Simplified implementation of transBlitFrom

---
 engines/sherlock/surface.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'engines/sherlock/surface.h')

diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 7d8b2819b0..385fb1793e 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -60,11 +60,6 @@ private:
 	void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, 
 		int overrideColor);
 
-	/**
-	 * Draws a surface at a given position within this surface with transparency
-	 */
-	void transBlitFrom(const Graphics::Surface &src, const Common::Point &destPos, const Common::Rect &srcBounds,
-		bool flipped = false, int overrideColor = 0, int scaleVal = SCALE_THRESHOLD);
 protected:
 	Graphics::Surface _surface;
 
@@ -121,19 +116,19 @@ public:
 	 * Draws an image frame at a given position within this surface with transparency
 	 */
 	void transBlitFrom(const ImageFrame &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0, int scaleVal = SCALE_THRESHOLD);
+		bool flipped = false, int overrideColor = 0, int scaleVal = 256);
 	
 	/**
 	* Draws a surface at a given position within this surface with transparency
 	*/
 	void transBlitFrom(const Surface &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0, int scaleVal = SCALE_THRESHOLD);
+		bool flipped = false, int overrideColor = 0, int scaleVal = 256);
 
 	/**
 	 * Draws a surface at a given position within this surface with transparency
 	 */
 	void transBlitFrom(const Graphics::Surface &src, const Common::Point &pt,
-		bool flipped = false, int overrideColor = 0, int scaleVal = SCALE_THRESHOLD);
+		bool flipped = false, int overrideColor = 0, int scaleVal = 256);
 
 	/**
 	 * Fill a given area of the surface with a given color
-- 
cgit v1.2.3