[Scummvm-cvs-logs] SF.net SVN: scummvm: [22200] scummvm/trunk/engines/simon/simon.cpp

[kirben at users.sourceforge.net]

Revision: 22200
Author:   kirben
Date:     2006-04-28 17:32:38 -0700 (Fri, 28 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22200&view=rev

Log Message:
-----------
Fix mistakes in animateSpritesByY() for FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-29 00:27:20 UTC (rev 22199)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-29 00:32:38 UTC (rev 22200)
@@ -2665,12 +2665,13 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.