aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/animation_he.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index b37a565aab..8329511c14 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -40,10 +40,7 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) {
_video = new Video::BinkDecoder();
else
#endif
- {
_video = new Video::SmackerDecoder();
- ((Video::AdvancedVideoDecoder *)_video)->start();
- }
_flags = 0;
_wizResNum = 0;
@@ -64,11 +61,16 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
if (_video->isVideoLoaded())
_video->close();
+ // Ensure that Bink will use our PixelFormat
+ ((Video::AdvancedVideoDecoder *)_video)->setDefaultHighColorFormat(g_system->getScreenFormat());
+
if (!_video->loadFile(filename)) {
warning("Failed to load video file %s", filename);
return -1;
}
+ ((Video::AdvancedVideoDecoder *)_video)->start();
+
debug(1, "Playing video %s", filename);
if (flags & 2)