aboutsummaryrefslogtreecommitdiff
path: root/sword1/animation.cpp
diff options
context:
space:
mode:
authorJames Brown2004-07-11 04:41:48 +0000
committerJames Brown2004-07-11 04:41:48 +0000
commit9756a420a3629900783c63f1bc4778c08e2c969b (patch)
tree80124eac426f0a93ac6a4767ab669a5186a48eed /sword1/animation.cpp
parent26f4df6aa35199522be4111da17e38f7a6ffbd61 (diff)
downloadscummvm-rg350-9756a420a3629900783c63f1bc4778c08e2c969b.tar.gz
scummvm-rg350-9756a420a3629900783c63f1bc4778c08e2c969b.tar.bz2
scummvm-rg350-9756a420a3629900783c63f1bc4778c08e2c969b.zip
Use extrapath in Sword1 engine (from 0.6.0 branch). More verbose errors to go with the forthcoming new manual. Sword1 CD swapping doesn't work as expected HERE, either :)
svn-id: r14188
Diffstat (limited to 'sword1/animation.cpp')
-rw-r--r--sword1/animation.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index a0962f0237..6dee00941a 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -25,6 +25,8 @@
#include "sound/audiostream.h"
+#include "common/config-manager.h"
+#include "common/str.h"
namespace Sword1 {
AnimationState::AnimationState(Screen *scr, SoundMixer *snd, OSystem *sys)
@@ -63,8 +65,9 @@ MoviePlayer::MoviePlayer(Screen *scr, SoundMixer *snd, OSystem *sys)
void MoviePlayer::play(const char *filename) {
#ifdef USE_MPEG2
AnimationState *anim = new AnimationState(_scr, _snd, _sys);
+ bool initOK = anim->init(filename);
- if (anim->init(filename)) {
+ if (initOK) {
while (anim->decodeFrame()) {
#ifndef BACKEND_8BIT
_sys->updateScreen();
@@ -98,4 +101,4 @@ void MoviePlayer::play(const char *filename) {
#endif
}
-} // End of namespace Sword2
+} // End of namespace Sword1