aboutsummaryrefslogtreecommitdiff
path: root/engines/toon/movie.cpp
diff options
context:
space:
mode:
authorSylvain Dupont2010-10-16 21:58:33 +0000
committerSylvain Dupont2010-10-16 21:58:33 +0000
commit40d38fcc0d8c63036132a7aab643a7405ef5f43f (patch)
tree3b4b79c363a60d3d6aeadbb28634749cbdd8f2ea /engines/toon/movie.cpp
parentbc5f10a55c0c19d3d90d2c9f4ed9909787718126 (diff)
downloadscummvm-rg350-40d38fcc0d8c63036132a7aab643a7405ef5f43f.tar.gz
scummvm-rg350-40d38fcc0d8c63036132a7aab643a7405ef5f43f.tar.bz2
scummvm-rg350-40d38fcc0d8c63036132a7aab643a7405ef5f43f.zip
TOON: Added most of the remaining Advanced Engine Features
Loading/Saving during runtime, Advanced Pausing, Load savestate via launcher, RTL svn-id: r53549
Diffstat (limited to 'engines/toon/movie.cpp')
-rw-r--r--engines/toon/movie.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 87a3e878b5..91ea98a91f 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -61,6 +61,7 @@ ToonstruckSmackerDecoder::ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::M
Movie::Movie(ToonEngine *vm , ToonstruckSmackerDecoder *decoder) {
_vm = vm;
+ _playing = false;
_decoder = decoder;
}
@@ -73,14 +74,16 @@ void Movie::init() const {
void Movie::play(Common::String video, int32 flags) {
debugC(1, kDebugMovie, "play(%s, %d)", video.c_str(), flags);
+ _playing = true;
if (flags & 1)
_vm->getAudioManager()->setMusicVolume(0);
_decoder->loadFile(video.c_str(), flags);
playVideo();
_vm->flushPalette();
if (flags & 1)
- _vm->getAudioManager()->setMusicVolume(100);
+ _vm->getAudioManager()->setMusicVolume(_vm->getAudioManager()->isMusicMuted() ? 0 : 255);
_decoder->close();
+ _playing = false;
}
bool Movie::playVideo() {