aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohndoe1232014-02-02 12:14:38 +0100
committerjohndoe1232014-02-02 12:14:38 +0100
commit5c93ecb130158da0f35ca70f8e251775ad4dc80e (patch)
tree28e9bcf2db2ee1ff145f4e771f3094fd23db9a7f
parentd0690dfbb12247ef0a04048b5b41c2a0510f8338 (diff)
downloadscummvm-rg350-5c93ecb130158da0f35ca70f8e251775ad4dc80e.tar.gz
scummvm-rg350-5c93ecb130158da0f35ca70f8e251775ad4dc80e.tar.bz2
scummvm-rg350-5c93ecb130158da0f35ca70f8e251775ad4dc80e.zip
BBVS: Set the best video mode when playing a video instead of a hardcoded one
-rw-r--r--engines/bbvs/videoplayer.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/bbvs/videoplayer.cpp b/engines/bbvs/videoplayer.cpp
index 0b6f011513..85cc5ed544 100644
--- a/engines/bbvs/videoplayer.cpp
+++ b/engines/bbvs/videoplayer.cpp
@@ -37,13 +37,11 @@ void BbvsEngine::playVideo(int videoNum) {
videoFilename = Common::String::format("vid/video%03d.avi", videoNum - 1);
// Set the correct video mode
- Common::List<Graphics::PixelFormat> formats;
- // RGB565 16bit
- Graphics::PixelFormat pixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
- formats.push_back(pixelFormat);
- initGraphics(320, 240, false, formats);
- if (_system->getScreenFormat().bytesPerPixel != pixelFormat.bytesPerPixel)
- error("Could not switch screen format for the video");
+ initGraphics(320, 240, false, 0);
+ if (_system->getScreenFormat().bytesPerPixel == 1) {
+ warning("Couldn't switch to a RGB color video mode to play a video.");
+ return;
+ }
Video::VideoDecoder *videoDecoder = new Video::AVIDecoder();
videoDecoder->loadFile(videoFilename);