XEEN: Refactor FontSurface as ancestors of Window, not Screen

This refactoring allowed Screen to now simply derive from
Graphics::Screen, and several duplicated methods could be removed.

1 files changed, 23 insertions, 0 deletions

diff --git a/engines/xeen/sprites.h b/engines/xeen/sprites.h
index b61ec83cd6..b94b7c9b7e 100644
--- a/engines/xeen/sprites.h
+++ b/engines/xeen/sprites.h
@@ -64,6 +64,12 @@ private:
 		const Common::Rect &bounds, int flags = 0, int scale = 0);
 
 	/**
+	 * Draw the sprite onto a given window
+	 */
+	void draw(int windowNum, int frame, const Common::Point &destPos,
+		const Common::Rect &bounds, int flags = 0, int scale = 0);
+
+	/**
 	 * Draw a sprite frame based on a passed offset into the data stream
 	 */
 	void drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt,
@@ -99,17 +105,34 @@ public:
 	 */
 	void clear();
 
+	/**
+	 * Draw a sprite onto a surface
+	 */
 	void draw(XSurface &dest, int frame, const Common::Point &destPos,
 		int flags = 0, int scale = 0);
 
+	/**
+	 * Draw a sprite onto a specific window
+	 */
 	void draw(Window &dest, int frame, const Common::Point &destPos,
 		int flags = 0, int scale = 0);
 
 	/**
+	 * Draw a sprite onto a given window
+	 */
+	void draw(int windowIndex, int frame, const Common::Point &destPos,
+		int flags = 0, int scale = 0);
+
+	/**
 	 * Draw the sprite onto the given surface
 	 */
 	void draw(XSurface &dest, int frame);
 
+	/**
+	 * Draw the sprite onto the given window
+	 */
+	void draw(int windowIndex, int frame);
+
 	int size() const { return _index.size(); }
 
 	bool empty() const { return _index.size() == 0; }