diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/tsage/ringworld/ringworld_scenes3.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/tsage/ringworld/ringworld_scenes3.cpp')
| -rw-r--r-- | engines/tsage/ringworld/ringworld_scenes3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp index 7103a48ed9..81190aea7b 100644 --- a/engines/tsage/ringworld/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld/ringworld_scenes3.cpp @@ -453,14 +453,14 @@ void Scene2000::stripCallback(int v) { switch (v) { case 0: _object9.setStrip(3); - _object9.animate(ANIM_MODE_7, NULL); + _object9.animate(ANIM_MODE_7, 0, NULL); _object10.setStrip(6); _object10.setFrame(1); _object10.animate(ANIM_MODE_5, NULL); break; case 1: _object10.setStrip(5); - _object10.animate(ANIM_MODE_7, NULL); + _object10.animate(ANIM_MODE_7, 0, NULL); _object9.setStrip(4); _object9.setFrame(1); _object9.animate(ANIM_MODE_5, NULL); @@ -1921,7 +1921,7 @@ void Scene2100::stripCallback(int v) { switch (v) { case 1: _object4._numFrames = 4; - _object4.animate(ANIM_MODE_7, NULL); + _object4.animate(ANIM_MODE_7, 0, NULL); break; case 2: _object4.animate(ANIM_MODE_NONE, NULL); |