From 509444cc9135e7d0bf7212ce01a1d61f8dcf0680 Mon Sep 17 00:00:00 2001
From: Robert Špalek
Date: Sun, 22 Nov 2009 02:42:15 +0000
Subject: Fixed Animation::getTopAnimation()

It does not return kTitleText and others.  This caused flickering of speech
texts on/off when the title got displayed under the mouse.

svn-id: r46056
---
 engines/draci/animation.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/draci')

diff --git a/engines/draci/animation.cpp b/engines/draci/animation.cpp
index 1b6cafed4e..dc14c7bb0d 100644
--- a/engines/draci/animation.cpp
+++ b/engines/draci/animation.cpp
@@ -504,10 +504,12 @@ const Animation *AnimationManager::getTopAnimation(int x, int y) const {
 			}
 		}
 
-		// Return the top-most animation object, unless it is an
-		// overlay sprite and there is an actual object underneath it.
+		// Return the top-most animation object, unless it is a
+		// non-clickable sprite (overlay, debugging sprites for
+		// walking, or title/speech text) and there is an actual object
+		// underneath it.
 		if (matches) {
-			if (anim->getID() != kOverlayImage) {
+			if (anim->getID() > kOverlayImage || anim->getID() < kSpeechText) {
 				return anim;
 			} else if (retval == NULL) {
 				retval = anim;
-- 
cgit v1.2.3