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

[thebluegr at users.sourceforge.net]

Revision: 32542
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32542&view=rev
Author:   thebluegr
Date:     2008-06-04 11:08:19 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Fixed the animation where the window is broken by the spear outside the church

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

Modified: scummvm/trunk/engines/drascula/animation.cpp
===================================================================
--- scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 17:41:40 UTC (rev 32541)
+++ scummvm/trunk/engines/drascula/animation.cpp	2008-06-04 18:08:19 UTC (rev 32542)
@@ -2480,20 +2480,18 @@
 	copyBackground(1, 1, 213, 66,	53,84, backSurface, screenSurface);
 	updateScreen();
 
-	// FIXME: the widths in these calls were 53 and 52 (by mistake, probably).
-	// I've set them to 53, but if any problems arise, we should try 52 as well
-	updateAnim(1, 213, 66, 53, 84, 6, backSurface);
-	updateAnim(86, 213, 66, 53, 84, 6, backSurface);
-	updateAnim(1, 213, 66, 53, 84, 6, extraSurface);
-	updateAnim(1, 213, 66, 53, 84, 6, extraSurface);
-	updateAnim(86, 213, 66, 53, 84, 6, extraSurface);
-	updateAnim(1, 213, 66, 53, 84, 6, frontSurface);
+	updateAnim(1, 213, 66, 52, 84, 6, backSurface);
+	updateAnim(86, 213, 66, 52, 84, 6, backSurface);
+	updateAnim(1, 213, 66, 52, 84, 6, extraSurface);
+	updateAnim(1, 213, 66, 52, 84, 6, extraSurface);
+	updateAnim(86, 213, 66, 52, 84, 6, extraSurface);
+	updateAnim(1, 213, 66, 52, 84, 6, frontSurface);
 
 	playSound(1);
-	updateAnim(86, 213, 66, 53, 84, 6, frontSurface);
+	updateAnim(86, 213, 66, 52, 84, 6, frontSurface);
 	stopSound();
 
-	updateAnim(1, 213, 66, 53, 84, 6, drawSurface3);
+	updateAnim(1, 213, 66, 52, 84, 6, drawSurface3);
 
 	loadPic(994, backSurface);
 	loadPic(974, extraSurface);

Modified: scummvm/trunk/engines/drascula/talk.cpp
===================================================================
--- scummvm/trunk/engines/drascula/talk.cpp	2008-06-04 17:41:40 UTC (rev 32541)
+++ scummvm/trunk/engines/drascula/talk.cpp	2008-06-04 18:08:19 UTC (rev 32542)
@@ -904,6 +904,7 @@
 	int y_mask_talk = 170;
 	int p, face = 0;
 	int length = strlen(said);
+	char buf[1];
 
 	color_abc(kColorYellow);
 
@@ -917,7 +918,8 @@
 	talkInit(filename);
 
 	do {
-		face = atoi(&syncChar[p]);
+		strncpy(buf, &syncChar[p], 1);
+		face = atoi(buf);
 
 		copyBackground(0, 0, 0, 0, 320, 200, drawSurface1, screenSurface);
 


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