[Scummvm-git-logs] scummvm master -> 82d59387ed5fb906abb2de4246324ff64808789e

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
82d59387ed SCI: Don't error out when updating an item with an invalid plane


Commit: 82d59387ed5fb906abb2de4246324ff64808789e
    https://github.com/scummvm/scummvm/commit/82d59387ed5fb906abb2de4246324ff64808789e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-20T02:04:51+02:00

Commit Message:
SCI: Don't error out when updating an item with an invalid plane

This is a script bug in PQ:SWAT, when skipping the Tactics Training - bug #10833

Changed paths:
    engines/sci/graphics/frameout.cpp


diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 93c2716..4036130 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -234,7 +234,9 @@ void GfxFrameout::kernelUpdateScreenItem(const reg_t object) {
 		const reg_t planeObject = readSelector(_segMan, object, SELECTOR(plane));
 		Plane *plane = _planes.findByObject(planeObject);
 		if (plane == nullptr) {
-			error("kUpdateScreenItem: Plane %04x:%04x not found for screen item %04x:%04x", PRINT_REG(planeObject), PRINT_REG(object));
+			// Script bug in PQ:SWAT, when skipping the Tactics Training
+			warning("kUpdateScreenItem: Plane %04x:%04x not found for screen item %04x:%04x", PRINT_REG(planeObject), PRINT_REG(object));
+			return;
 		}
 
 		ScreenItem *screenItem = plane->_screenItemList.findByObject(object);