diff options
| author | Sylvain Dupont | 2011-01-30 20:21:45 +0000 |
|---|---|---|
| committer | Sylvain Dupont | 2011-01-30 20:21:45 +0000 |
| commit | 5257d91e99775c583f998a2508011ebd4a372fec (patch) | |
| tree | fc10fd084e71a1b86d55d417c7ef1844b07b9c40 | |
| parent | 867c0d9645a6475e000cd7f49d72450517aea9aa (diff) | |
| download | scummvm-rg350-5257d91e99775c583f998a2508011ebd4a372fec.tar.gz scummvm-rg350-5257d91e99775c583f998a2508011ebd4a372fec.tar.bz2 scummvm-rg350-5257d91e99775c583f998a2508011ebd4a372fec.zip | |
TOON: Fixes two movie issues
- Can't skip the videos with left button anymore, now the Nefarius video on the
TV is played normally and not skipped.
- Last video playback 2x too big in height.
svn-id: r55662
| -rw-r--r-- | engines/toon/movie.cpp | 4 | ||||
| -rw-r--r-- | engines/toon/script_func.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp index 7743b6aa7f..d41fde66c2 100644 --- a/engines/toon/movie.cpp +++ b/engines/toon/movie.cpp @@ -44,7 +44,7 @@ bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename, int forc _lowRes = false; if (Video::SmackerDecoder::loadFile(filename)) { - if (forcedflags & 0x10 || _surface->h == 200) { + if (_surface->h == 200) { if (_surface) { _surface->free(); delete _surface; @@ -119,7 +119,7 @@ bool Movie::playVideo() { Common::Event event; while (_vm->getSystem()->getEventManager()->pollEvent(event)) - if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP) { + if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE)) { return false; } diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp index 67e20f3354..bc55a5aa6f 100644 --- a/engines/toon/script_func.cpp +++ b/engines/toon/script_func.cpp @@ -321,8 +321,6 @@ int32 ScriptFunc::sys_Cmd_Play_Flic(EMCState *state) { else strcpy(name, _vm->createRoomFilename(GetText(0, state)).c_str()); -// Strangerke - Commented (not used) -// int32 Flags = stackPos(1); int32 stopMusic = stackPos(2); _vm->getMoviePlayer()->play(name, stopMusic); return 0; |