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

[cyx at users.sourceforge.net]

Revision: 44899
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44899&view=rev
Author:   cyx
Date:     2009-10-11 09:26:36 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
TUCKER: fix original game glitch (tracker item #2872385 - Fish swims out of aquarium)

Modified Paths:
--------------
    scummvm/trunk/engines/tucker/tucker.cpp

Modified: scummvm/trunk/engines/tucker/tucker.cpp
===================================================================
--- scummvm/trunk/engines/tucker/tucker.cpp	2009-10-11 09:25:31 UTC (rev 44898)
+++ scummvm/trunk/engines/tucker/tucker.cpp	2009-10-11 09:26:36 UTC (rev 44899)
@@ -1228,6 +1228,13 @@
 				a->animCurrentCounter = a->animInitCounter;
 				a->drawFlag = 0;
 			}
+			if (_locationNum == 24 && i == 0) {
+				// workaround bug #2872385: update fish animation sequence for correct
+				// position in aquarium.
+				if (a->animInitCounter == 505 && a->animCurrentCounter == 513) {
+					a->animCurrentCounter = 525;
+				}
+			}
 			a->graphicNum = _staticData3Table[a->animCurrentCounter];
 		}
 	}
@@ -1528,9 +1535,9 @@
 
 void TuckerEngine::drawData3() {
 	for (int i = 0; i < _locationAnimationsCount; ++i) {
-		int num = _locationAnimationsTable[i].graphicNum;
-		const Data *d = &_dataTable[num];
 		if (_locationAnimationsTable[i].drawFlag != 0) {
+			int num = _locationAnimationsTable[i].graphicNum;
+			const Data *d = &_dataTable[num];
 			Graphics::decodeRLE(_locationBackgroundGfxBuf + d->yDest * 640 + d->xDest, _data3GfxBuf + d->sourceOffset, d->xSize, d->ySize);
 			addDirtyRect(d->xDest, d->yDest, d->xSize, d->ySize);
 		}


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