[Scummvm-cvs-logs] SF.net SVN: scummvm: [20487] scummvm/trunk/kyra/sequences.cpp

[vinterstum at users.sourceforge.net]

Revision: 20487
Author:   vinterstum
Date:     2006-02-10 22:41:33 -0800 (Fri, 10 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20487&view=rev

Log Message:
-----------
Fixed bug [ 1403083 ] KYRA: Brandon graphics glitch when using the ice scroll
The CD version of this particular sequence is only half the length of the floppy
version.

Modified Paths:
--------------
    scummvm/trunk/kyra/sequences.cpp
Modified: scummvm/trunk/kyra/sequences.cpp
===================================================================
--- scummvm/trunk/kyra/sequences.cpp	2006-02-11 01:32:22 UTC (rev 20486)
+++ scummvm/trunk/kyra/sequences.cpp	2006-02-11 06:41:33 UTC (rev 20487)
@@ -489,7 +489,7 @@
 }
 
 void KyraEngine::seq_winterScroll1() {
-	debug(9, "seq_winterScroll1()");
+	debug(1, "seq_winterScroll1()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
 	assert(_winterScrollTable);
@@ -505,10 +505,21 @@
 	}
 	
 	freeShapes123();
+	
 	snd_playSoundEffect(0x20);
-	setupShapes123(_winterScroll1Table, 35, 0);
-	
-	for (int i = 123; i <= 146; ++i) {
+
+	uint8 endEncode, midpoint, endpoint;
+	if (_features & GF_TALKIE) {
+		endEncode = 18;
+		midpoint = 135;
+		endpoint = 140;
+	} else {
+		endEncode = 35;
+		midpoint = 146;
+		endpoint = 157;
+	}
+	setupShapes123(_winterScroll1Table, endEncode, 0);
+	for (int i = 123; i <= midpoint; ++i) {
 		_currentCharacter->currentAnimFrame = i;
 		animRefreshNPC(0);
 		delayWithTicks(8);
@@ -523,7 +534,7 @@
 		setGameFlag(0xA2);
 	}
 	
-	for (int i = 147; i <= 157; ++i) {
+	for (int i = midpoint+1; i <= endpoint; ++i) {
 		_currentCharacter->currentAnimFrame = i;
 		animRefreshNPC(0);
 		delayWithTicks(8);