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, 10 insertions, 0 deletions

diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 8070368a30..430505e7d2 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -308,6 +308,12 @@ void SpriteResource::draw(Window &dest, int frame, const Common::Point &destPos,
 	draw(dest, frame, destPos, dest.getBounds(), flags, scale);
 }
 
+void SpriteResource::draw(int windowIndex, int frame, const Common::Point &destPos,
+		int flags, int scale) {
+	Window &win = (*g_vm->_windows)[windowIndex];
+	draw(win, frame, destPos, flags, scale);
+}
+
 void SpriteResource::draw(XSurface &dest, int frame, const Common::Point &destPos,
 		const Common::Rect &bounds, int flags, int scale) {
 
@@ -320,6 +326,10 @@ void SpriteResource::draw(XSurface &dest, int frame) {
 	draw(dest, frame, Common::Point());
 }
 
+void SpriteResource::draw(int windowIndex, int frame) {
+	draw((*g_vm->_windows)[windowIndex], frame, Common::Point());
+}
+
 uint SpriteResource::getScaledVal(int xy, uint16 &scaleMask) {
 	if (!xy)
 		return 0;