diff options
| author | Matthew Hoops | 2011-07-13 12:08:26 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-13 12:08:26 -0400 |
| commit | a50abde1b1228aa8364349728ad7f4f328d4a2f4 (patch) | |
| tree | 497d8f5037e80959a07da83dd3aa5f0f36194571 /engines/scumm | |
| parent | 7dc727131682806c9bd97ba1099ee2291c21a7a6 (diff) | |
| download | scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.tar.gz scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.tar.bz2 scummvm-rg350-a50abde1b1228aa8364349728ad7f4f328d4a2f4.zip | |
BUILD: Allow for disabling Bink support
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 7c1bbfc9a5..40e99c26a8 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -26,15 +26,20 @@ #include "scumm/he/intern_he.h" #include "audio/audiostream.h" -#include "video/bink_decoder.h" #include "video/smk_decoder.h" +#ifdef USE_BINK +#include "video/bink_decoder.h" +#endif + namespace Scumm { MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) { +#ifdef USE_BINK if (_vm->_game.heversion >= 100 && (_vm->_game.features & GF_16BIT_COLOR)) _video = new Video::BinkDecoder(); else +#endif _video = new Video::SmackerDecoder(mixer); _flags = 0; diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 65d34a4f2e..4527d7a121 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -704,8 +704,12 @@ void ScummEngine_v99he::resetScummVars() { VAR(VAR_NUM_UNK) = _numUnk; if (_game.heversion >= 100 && (_game.features & GF_16BIT_COLOR)) { - // Enable Bink and Smacker video in 16bit color games + // Enable Bink video in 16bit color games +#ifdef USE_BINK VAR(140) = 1; +#else + VAR(140) = 0; +#endif } } #endif |