aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOystein Eftevaag2006-02-11 06:41:33 +0000
committerOystein Eftevaag2006-02-11 06:41:33 +0000
commit63b1913c730304540bc0aa95c0615cd5f0f1f5d2 (patch)
tree1738a68019dcf6490687fb86f6ab461c84a1faa8
parentebb5564a5791948bc8cc50f1766c1fc1352670fe (diff)
downloadscummvm-rg350-63b1913c730304540bc0aa95c0615cd5f0f1f5d2.tar.gz
scummvm-rg350-63b1913c730304540bc0aa95c0615cd5f0f1f5d2.tar.bz2
scummvm-rg350-63b1913c730304540bc0aa95c0615cd5f0f1f5d2.zip
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. svn-id: r20487
-rw-r--r--kyra/sequences.cpp21
1 files changed, 16 insertions, 5 deletions
diff --git a/kyra/sequences.cpp b/kyra/sequences.cpp
index 8b7822f0e6..b03205b3d3 100644
--- a/kyra/sequences.cpp
+++ b/kyra/sequences.cpp
@@ -489,7 +489,7 @@ void KyraEngine::seq_playFluteAnimation() {
}
void KyraEngine::seq_winterScroll1() {
- debug(9, "seq_winterScroll1()");
+ debug(1, "seq_winterScroll1()");
_screen->hideMouse();
checkAmuletAnimFlags();
assert(_winterScrollTable);
@@ -505,10 +505,21 @@ void KyraEngine::seq_winterScroll1() {
}
freeShapes123();
- snd_playSoundEffect(0x20);
- setupShapes123(_winterScroll1Table, 35, 0);
- for (int i = 123; i <= 146; ++i) {
+ snd_playSoundEffect(0x20);
+
+ 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 @@ void KyraEngine::seq_winterScroll1() {
setGameFlag(0xA2);
}
- for (int i = 147; i <= 157; ++i) {
+ for (int i = midpoint+1; i <= endpoint; ++i) {
_currentCharacter->currentAnimFrame = i;
animRefreshNPC(0);
delayWithTicks(8);