[Scummvm-cvs-logs] scummvm master -> c424c22f19a050b1a2ee421e80172f7dda571dac

bluegr md5 at scummvm.org
Fri May 11 11:55:41 CEST 2012


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:
c424c22f19 SCI: Fix bug #3040625 - "SCI: ECOQUEST French/German: Speech balloon graphic glitch"


Commit: c424c22f19a050b1a2ee421e80172f7dda571dac
    https://github.com/scummvm/scummvm/commit/c424c22f19a050b1a2ee421e80172f7dda571dac
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-05-11T02:54:06-07:00

Commit Message:
SCI: Fix bug #3040625 - "SCI: ECOQUEST French/German: Speech balloon graphic glitch"

This bug is caused by the fact that the sprites in that scene and the
speech bubble share the same priority, so we compensate for that with a
workaround

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



diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index a77bccc..4e5c4da 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -720,6 +720,19 @@ void GfxView::draw(const Common::Rect &rect, const Common::Rect &clipRect, const
 
 	bitmap += (clipRect.top - rect.top) * celWidth + (clipRect.left - rect.left);
 
+	// WORKAROUND: EcoQuest French and German draw the fish and anemone sprites
+	// with priority 15 in scene 440. Afterwards, a dialog is shown on top of
+	// these sprites with priority 15 as well. This is undefined behavior
+	// actually, as the sprites and dialog share the same priority, so in our
+	// implementation the sprites get drawn incorrectly on top of the dialog.
+	// Perhaps this worked by mistake in SSCI because of subtle differences in
+	// how sprites are drawn. We compensate for this by resetting the priority
+	// of all sprites that have a priority of 15 in scene 440 to priority 14,
+	// so that the speech bubble can be drawn correctly on top of them. Fixes
+	// bug #3040625.
+	if (g_sci->getGameId() == GID_ECOQUEST && g_sci->getEngineState()->currentRoomNumber() == 440 && priority == 15)
+		priority = 14;
+
 	if (!_EGAmapping) {
 		for (y = 0; y < height; y++, bitmap += celWidth) {
 			for (x = 0; x < width; x++) {






More information about the Scummvm-git-logs mailing list