aboutsummaryrefslogtreecommitdiff
path: root/engines/draci
diff options
context:
space:
mode:
authorRobert Špalek2009-11-22 02:42:15 +0000
committerRobert Špalek2009-11-22 02:42:15 +0000
commit509444cc9135e7d0bf7212ce01a1d61f8dcf0680 (patch)
tree8ef8dbb868fdcd4b3e3d0e1eef41c22a54480648 /engines/draci
parenta2b056c28802f1c69561dd22752f19e44173537e (diff)
downloadscummvm-rg350-509444cc9135e7d0bf7212ce01a1d61f8dcf0680.tar.gz
scummvm-rg350-509444cc9135e7d0bf7212ce01a1d61f8dcf0680.tar.bz2
scummvm-rg350-509444cc9135e7d0bf7212ce01a1d61f8dcf0680.zip
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
Diffstat (limited to 'engines/draci')
-rw-r--r--engines/draci/animation.cpp8
1 files changed, 5 insertions, 3 deletions
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;