1 files changed, 23 insertions, 10 deletions

diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 0f06ee1c85..e736872773 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -149,10 +149,7 @@ struct ShowStyleEntry {
 typedef Common::Array<DrawList> ScreenItemListList;
 typedef Common::Array<RectList> EraseListList;
 
-class GfxCache;
 class GfxCoordAdjuster32;
-class GfxPaint32;
-class GfxPalette;
 class GfxScreen;
 
 /**
@@ -162,16 +159,14 @@ class GfxScreen;
 class GfxFrameout {
 private:
 	bool _isHiRes;
-	GfxCache *_cache;
 	GfxCoordAdjuster32 *_coordAdjuster;
 	GfxPalette32 *_palette;
 	ResourceManager *_resMan;
 	GfxScreen *_screen;
 	SegManager *_segMan;
-	GfxPaint32 *_paint32;
 
 public:
-	GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAdjuster *coordAdjuster, GfxCache *cache, GfxScreen *screen, GfxPalette32 *palette, GfxPaint32 *paint32);
+	GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAdjuster *coordAdjuster, GfxScreen *screen, GfxPalette32 *palette);
 	~GfxFrameout();
 
 	void clear();
@@ -194,13 +189,28 @@ private:
 	 */
 	bool _throttleFrameOut;
 
+	/**
+	 * Determines whether or not a screen item is the "Fred"
+	 * object.
+	 */
+	bool checkForFred(const reg_t object);
+
 #pragma mark -
 #pragma mark Screen items
 private:
-	void deleteScreenItem(ScreenItem *screenItem, const reg_t plane);
 	void remapMarkRedraw();
 
 public:
+	/**
+	 * Deletes a screen item from the given plane.
+	 */
+	void deleteScreenItem(ScreenItem *screenItem, Plane *plane);
+
+	/**
+	 * Deletes a screen item from the given plane.
+	 */
+	void deleteScreenItem(ScreenItem *screenItem, const reg_t plane);
+
 	void kernelAddScreenItem(const reg_t object);
 	void kernelUpdateScreenItem(const reg_t object);
 	void kernelDeleteScreenItem(const reg_t object);
@@ -366,8 +376,10 @@ private:
 	 * over the entire screen for rendering the next frame.
 	 * The draw and erase lists in `drawLists` and
 	 * `eraseLists` each represent one plane on the screen.
+	 * The optional `eraseRect` argument allows a specific
+	 * area of the screen to be erased.
 	 */
-	void calcLists(ScreenItemListList &drawLists, EraseListList &eraseLists, const Common::Rect &calcRect);
+	void calcLists(ScreenItemListList &drawLists, EraseListList &eraseLists, const Common::Rect &eraseRect = Common::Rect());
 
 	/**
 	 * Erases the areas in the given erase list from the
@@ -420,9 +432,10 @@ public:
 	/**
 	 * Updates the internal screen buffer for the next
 	 * frame. If `shouldShowBits` is true, also sends the
-	 * buffer to hardware.
+	 * buffer to hardware. If `eraseRect` is non-empty,
+	 * it is added to the erase list for this frame.
 	 */
-	void frameOut(const bool shouldShowBits, const Common::Rect &rect = Common::Rect());
+	void frameOut(const bool shouldShowBits, const Common::Rect &eraseRect = Common::Rect());
 
 	/**
 	 * Modifies the raw pixel data for the next frame with