diff options
author | Thierry Crozat | 2018-10-31 21:37:56 +0000 |
---|---|---|
committer | Thierry Crozat | 2018-11-04 22:33:22 +0100 |
commit | e2935acfe4a6d332f7b1388fa98fce711cde8c12 (patch) | |
tree | 9f1ef23eeb0903fdffc44c15034cbc2c70257d53 /engines/zvision/zvision.cpp | |
parent | 71910c2283532a2071aed725835c66afee451e2d (diff) | |
download | scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.tar.gz scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.tar.bz2 scummvm-rg350-e2935acfe4a6d332f7b1388fa98fce711cde8c12.zip |
ZVISION: Disable MPEG movies when liba52 is not enabled
Diffstat (limited to 'engines/zvision/zvision.cpp')
-rw-r--r-- | engines/zvision/zvision.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 5a53383501..7bd16cb448 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -193,8 +193,11 @@ void ZVision::initialize() { Graphics::ModeList modes; modes.push_back(Graphics::Mode(WINDOW_WIDTH, WINDOW_HEIGHT)); +#if defined(USE_MPEG2) && defined(USE_A52) + // For the DVD version of ZGI we can play high resolution videos if (getGameId() == GID_GRANDINQUISITOR && (getFeatures() & GF_DVD)) modes.push_back(Graphics::Mode(HIRES_WINDOW_WIDTH, HIRES_WINDOW_HEIGHT)); +#endif initGraphicsModes(modes); initScreen(); @@ -225,8 +228,8 @@ void ZVision::initialize() { loadSettings(); -#ifndef USE_MPEG2 - // libmpeg2 not loaded, disable the MPEG2 movies option +#if !defined(USE_MPEG2) || !defined(USE_A52) + // libmpeg2 or liba52 not loaded, disable the MPEG2 movies option _scriptManager->setStateValue(StateKey_MPEGMovies, 2); #endif |