1 files changed, 50 insertions, 15 deletions

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index c0feea8999..a7899b8d89 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -115,6 +115,7 @@ GfxFrameout::GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAd
 	}
 
 	switch (g_sci->getGameId()) {
+	case GID_HOYLE5:
 	case GID_GK2:
 	case GID_LIGHTHOUSE:
 	case GID_LSL7:
@@ -278,20 +279,52 @@ bool GfxFrameout::checkForFred(const reg_t object) {
 #pragma mark -
 #pragma mark Screen items
 
-void GfxFrameout::deleteScreenItem(ScreenItem *screenItem, Plane *plane) {
-	if (screenItem->_created == 0) {
-		screenItem->_created = 0;
-		screenItem->_updated = 0;
-		screenItem->_deleted = getScreenCount();
+void GfxFrameout::addScreenItem(ScreenItem &screenItem) const {
+	Plane *plane = _planes.findByObject(screenItem._plane);
+	if (plane == nullptr) {
+		error("GfxFrameout::addScreenItem: Could not find plane %04x:%04x for screen item %04x:%04x", PRINT_REG(screenItem._plane), PRINT_REG(screenItem._object));
+	}
+	plane->_screenItemList.add(&screenItem);
+}
+
+void GfxFrameout::updateScreenItem(ScreenItem &screenItem) const {
+	// TODO: In SCI3+ this will need to go through Plane
+//	Plane *plane = _planes.findByObject(screenItem._plane);
+//	if (plane == nullptr) {
+//		error("GfxFrameout::updateScreenItem: Could not find plane %04x:%04x for screen item %04x:%04x", PRINT_REG(screenItem._plane), PRINT_REG(screenItem._object));
+//	}
+
+	screenItem.update();
+}
+
+void GfxFrameout::deleteScreenItem(ScreenItem &screenItem) {
+	Plane *plane = _planes.findByObject(screenItem._plane);
+	if (plane == nullptr) {
+		error("GfxFrameout::deleteScreenItem: Could not find plane %04x:%04x for screen item %04x:%04x", PRINT_REG(screenItem._plane), PRINT_REG(screenItem._object));
+	}
+	if (plane->_screenItemList.findByObject(screenItem._object) == nullptr) {
+		error("GfxFrameout::deleteScreenItem: Screen item %04x:%04x not found in plane %04x:%04x", PRINT_REG(screenItem._object), PRINT_REG(screenItem._plane));
+	}
+	deleteScreenItem(screenItem, *plane);
+}
+
+void GfxFrameout::deleteScreenItem(ScreenItem &screenItem, Plane &plane) {
+	if (screenItem._created == 0) {
+		screenItem._created = 0;
+		screenItem._updated = 0;
+		screenItem._deleted = getScreenCount();
 	} else {
-		plane->_screenItemList.erase(screenItem);
-		plane->_screenItemList.pack();
+		plane._screenItemList.erase(&screenItem);
+		plane._screenItemList.pack();
 	}
 }
 
-void GfxFrameout::deleteScreenItem(ScreenItem *screenItem, const reg_t planeObject) {
+void GfxFrameout::deleteScreenItem(ScreenItem &screenItem, const reg_t planeObject) {
 	Plane *plane = _planes.findByObject(planeObject);
-	deleteScreenItem(screenItem, plane);
+	if (plane == nullptr) {
+		error("GfxFrameout::deleteScreenItem: Could not find plane %04x:%04x for screen item %04x:%04x", PRINT_REG(planeObject), PRINT_REG(screenItem._object));
+	}
+	deleteScreenItem(screenItem, *plane);
 }
 
 void GfxFrameout::kernelAddScreenItem(const reg_t object) {
@@ -364,7 +397,7 @@ void GfxFrameout::kernelDeleteScreenItem(const reg_t object) {
 		return;
 	}
 
-	deleteScreenItem(screenItem, plane);
+	deleteScreenItem(*screenItem, *plane);
 }
 
 #pragma mark -
@@ -540,7 +573,7 @@ void GfxFrameout::frameOut(const bool shouldShowBits, const Common::Rect &eraseR
 //		_robot->frameAlmostVisible();
 //	}
 
-	_palette->updateHardware();
+	_palette->updateHardware(!shouldShowBits);
 
 	if (shouldShowBits) {
 		showBits();
@@ -1111,7 +1144,7 @@ void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry
 
 	_palette->submit(nextPalette);
 	_palette->updateFFrame();
-	_palette->updateHardware();
+	_palette->updateHardware(false);
 	showBits();
 
 	_frameNowVisible = true;
@@ -1483,6 +1516,10 @@ void GfxFrameout::processShowStyles() {
 			}
 		}
 
+		if (g_engine->shouldQuit()) {
+			return;
+		}
+
 		if (doFrameOut) {
 			frameOut(true);
 
@@ -1490,9 +1527,7 @@ void GfxFrameout::processShowStyles() {
 			// fast, but the throttle value is arbitrary. Someone on
 			// real hardware probably needs to test what the actual
 			// speed of these transitions should be
-			EngineState *state = g_sci->getEngineState();
-			state->speedThrottler(33);
-			state->_throttleTrigger = true;
+			throttle();
 		}
 	} while(continueProcessing && doFrameOut);
 }