diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/saga/saga.cpp | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/saga/saga.cpp')
| -rw-r--r-- | engines/saga/saga.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 99462c5583..76731c201a 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -107,7 +107,6 @@ SagaEngine::SagaEngine(OSystem *syst) // Mac CD Wyrmkeep Common::File::addDefaultDirectory(_gameDataPath + "patch/"); - // Setup mixer if (!_mixer->isReady()) { warning("Sound initialization failed."); @@ -150,6 +149,8 @@ int SagaEngine::init() { _subtitlesEnabled = ConfMan.getBool("subtitles"); _readingSpeed = getTalkspeed(); _copyProtection = ConfMan.getBool("copy_protection"); + _gf_wyrmkeep = false; + _gf_compressed_sounds = false; if (_readingSpeed > 3) _readingSpeed = 0; @@ -454,6 +455,9 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) { colorId = kITEColorTransBlack; break; + case (kKnownColorBrightWhite): + colorId = kITEColorBrightWhite; + break; case (kKnownColorBlack): colorId = kIHNMColorBlack; break; |