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

[thebluegr at users.sourceforge.net]

Revision: 32648
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32648&view=rev
Author:   thebluegr
Date:     2008-06-10 13:19:44 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Fixed character walking in room 14 (the bar, right after BJ is kidnapped). This should fix the issues with the pianist in bug report #1979989 - "DRASCULA : Lip sync error when talking to pianist"

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

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2008-06-10 19:57:38 UTC (rev 32647)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2008-06-10 20:19:44 UTC (rev 32648)
@@ -429,12 +429,21 @@
 		}
 
 		if (currentChapter == 2) {
-			if (roomNumber == 3 && (curX == 279) && (curY + curHeight == 101))
+			// NOTE: the checks for room number 14 below are a hack used in the original
+			// game, and move the character to a place where his feet are not drawn above
+			// the pianist's head. Originally, walkToObject was not updated properly, which
+			// lead to an incorrect setting of the protagonist's tracking flag (above). This
+			// made the character start walking off screen, as his actual position was
+			// different than the displayed one
+			if (roomNumber == 3 && (curX == 279) && (curY + curHeight == 101)) {
 				animation_1_2();
-			else if (roomNumber == 14 && (curX == 214) && (curY + curHeight == 121))
+			} else if (roomNumber == 14 && (curX == 214) && (curY + curHeight == 121)) {
+				walkToObject = 1;
 				gotoObject(190, 130);
-			else if (roomNumber == 14 && (curX == 246) && (curY + curHeight == 112))
+			} else if (roomNumber == 14 && (curX == 246) && (curY + curHeight == 112)) {
+				walkToObject = 1;
 				gotoObject(190, 130);
+			}
 		}
 
 		moveCursor();


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