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

[sev at users.sourceforge.net]

Revision: 49704
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49704&view=rev
Author:   sev
Date:     2010-06-15 10:18:51 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Drascula: Fix bug #2854303.

Bug #2854303: "DRASCULA: Glitch when using cross on vampire guard".
Apparently during refactoring of animation-related code duplication
the conversion was incorrect. Rewrote relevant function.

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

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2010-06-15 10:18:34 UTC (rev 49703)
+++ scummvm/trunk/engines/drascula/animation.cpp	2010-06-15 10:18:51 UTC (rev 49704)
@@ -32,9 +32,12 @@
 
 	for (int n = 0; n < count; n++){
 		x++;
-		copyBackground(x, y, destX, destY, width, height, src, screenSurface);
-		if (copyRectangle)
+		if (copyRectangle) {
+			copyBackground(destX, destY, destX, destY, width, height, bgSurface, screenSurface);
 			copyRect(x, y, destX, destY, width, height, src, screenSurface);
+		} else {
+			copyBackground(x, y, destX, destY, width, height, src, screenSurface);
+		}
 		updateScreen(destX, destY, destX, destY, width, height, screenSurface);
 		x += width;
 		pause(delayVal);
@@ -1083,6 +1086,7 @@
 	fadeToBlack(2);
 }
 
+// Use cross on Yoda
 void DrasculaEngine::animation_2_3() {
 	debug(4, "animation_2_3()");
 


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