SHERLOCK: Remove iimplicit conversion operator from ImageFrame

1 files changed, 13 insertions, 0 deletions

diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index b54f43bf52..83d4b78a0a 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -22,6 +22,7 @@
 
 #include "sherlock/surface.h"
 #include "sherlock/sherlock.h"
+#include "sherlock/resources.h"
 #include "common/system.h"
 #include "graphics/palette.h"
 
@@ -51,10 +52,18 @@ void Surface::blitFrom(const Graphics::Surface &src) {
 	blitFrom(src, Common::Point(0, 0));
 }
 
+void Surface::blitFrom(const ImageFrame &src) {
+	blitFrom(src._frame, Common::Point(0, 0));
+}
+
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt) {
 	blitFrom(src, pt, Common::Rect(0, 0, src.w, src.h));
 }
 
+void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt) {
+	blitFrom(src._frame, pt, Common::Rect(0, 0, src._frame.w, src._frame.h));
+}
+
 void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 		const Common::Rect &srcBounds) {
 	Common::Rect srcRect = srcBounds;
@@ -67,6 +76,10 @@ void Surface::blitFrom(const Graphics::Surface &src, const Common::Point &pt,
 	}
 }
 
+void Surface::blitFrom(const ImageFrame &src, const Common::Point &pt, const Common::Rect &srcBounds) {
+	blitFrom(src._frame, pt, srcBounds);
+}
+
 void Surface::transBlitFrom(const ImageFrame &src, const Common::Point &pt,
 		bool flipped, int overrideColor) {
 	transBlitFrom(src._frame, pt + src._offset, flipped, overrideColor);