aboutsummaryrefslogtreecommitdiff
path: root/engines/simon
diff options
context:
space:
mode:
authorTravis Howell2006-04-29 00:32:38 +0000
committerTravis Howell2006-04-29 00:32:38 +0000
commit9774261e0f11f14b3403a6894fa58e9a180ac51b (patch)
tree3bc760447b304705cf3b1949d287a92a2cd1a1f5 /engines/simon
parentbf7359881115a5b041028b032ee28430bc5e36d3 (diff)
downloadscummvm-rg350-9774261e0f11f14b3403a6894fa58e9a180ac51b.tar.gz
scummvm-rg350-9774261e0f11f14b3403a6894fa58e9a180ac51b.tar.bz2
scummvm-rg350-9774261e0f11f14b3403a6894fa58e9a180ac51b.zip
Fix mistakes in animateSpritesByY() for FF
svn-id: r22200
Diffstat (limited to 'engines/simon')
-rw-r--r--engines/simon/simon.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index ec2127645c..73a7ed0049 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -2665,12 +2665,13 @@ void SimonEngine::animateSpritesByY() {
while (vsp->id != 0) {
if (vsp->flags & kDFScaled) {
y = vsp->y;
- } else {
- y = vsp->priority;
+ } else if (vsp->flags & kDFMasked) {
vpe = &_vgaBufferPointers[vsp->zoneNum];
src = vpe->vgaFile2 + vsp->image * 8;
height = READ_LE_UINT16(src + 4) & 0x7FFF;
- y += height;
+ y = vsp->y + height;
+ } else {
+ y = vsp->priority;
}
spriteTable[numSprites][0] = y;