aboutsummaryrefslogtreecommitdiff
path: root/sword1/animation.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-02-15 14:22:54 +0000
committerTorbjörn Andersson2004-02-15 14:22:54 +0000
commit55556c813c1ff169658dfb2c7e5e6ec665ce17ed (patch)
tree62073189a984219236d2ba41b2e9e23bccc48e9d /sword1/animation.cpp
parent2e7badd6dc1b1f276d52395cb8fcdc6783995ae5 (diff)
downloadscummvm-rg350-55556c813c1ff169658dfb2c7e5e6ec665ce17ed.tar.gz
scummvm-rg350-55556c813c1ff169658dfb2c7e5e6ec665ce17ed.tar.bz2
scummvm-rg350-55556c813c1ff169658dfb2c7e5e6ec665ce17ed.zip
Proper handling of BS2 cutscene lead-outs, plus some other minor fixes.
svn-id: r12907
Diffstat (limited to 'sword1/animation.cpp')
-rw-r--r--sword1/animation.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index 46d8c59006..73b88221a7 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -74,8 +74,14 @@ bool AnimationState::init(const char *basename) {
p = 0;
while (!feof(f)) {
- if (fscanf(f, "%i %i", &palettes[p].end, &palettes[p].cnt) != 2)
+ int end, cnt;
+
+ if (fscanf(f, "%i %i", &end, &cnt) != 2)
break;
+
+ palettes[p].end = (uint) end;
+ palettes[p].cnt = (uint) cnt;
+
for (i = 0; i < palettes[p].cnt; i++) {
int r, g, b;
fscanf(f, "%i", &r);