Ticket #8412: sky.patch

File sky.patch, 2.7 KB (added by salty-horse, 17 years ago)

ok, now I got it

  • base/gameDetector.cpp

    RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
    retrieving revision 1.116
    diff -u -r1.116 gameDetector.cpp
     
    144144        ConfMan.registerDefault("platform", Common::kPlatformPC);
    145145        ConfMan.registerDefault("language", "en");
    146146        ConfMan.registerDefault("speech_mute", false);
     147        ConfMan.registerDefault("sfx_mute", false);
    147148        ConfMan.registerDefault("subtitles", false);
    148149        ConfMan.registerDefault("boot_param", 0);
    149150        ConfMan.registerDefault("save_slot", -1);
  • sky/control.cpp

    RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
    retrieving revision 1.95
    diff -u -r1.95 control.cpp
     
    708708                pButton->_text = 0x7000 + 86;
    709709                _statusBar->setToText(0x7000 + 86);
    710710        }
     711
     712        ConfMan.set("sfx_mute", (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) != 0);
     713
    711714        pButton->drawToScreen(WITH_MASK);
    712715        buttonControl(pButton);
    713716        _system->updateScreen();
     
    731734        }
    732735
    733736        ConfMan.set("subtitles", (flags & SF_ALLOW_TEXT) != 0);
     737        ConfMan.set("speech_mute", (flags & SF_ALLOW_SPEECH) == 0);
    734738
    735739        SkyEngine::_systemVars.systemFlags |= flags;
    736740
  • sky/sky.cpp

    RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
    retrieving revision 1.177
    diff -u -r1.177 sky.cpp
     
    283283        if (!_mixer->isReady())
    284284                warning("Sound initialisation failed");
    285285
     286        if (ConfMan.getBool("sfx_mute")) {
     287                SkyEngine::_systemVars.systemFlags |= SF_FX_OFF;
     288        }
    286289         _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
    287290         _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
    288291        _floppyIntro = ConfMan.getBool("alt_intro");
     
    305308        }
    306309
    307310        if (isCDVersion()) {
    308                 _systemVars.systemFlags |= SF_ALLOW_SPEECH;
    309311                if (ConfMan.hasKey("nosubtitles")) {
    310312                        warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
    311313                        if (!ConfMan.getBool("nosubtitles"))
     
    314316
    315317                if (ConfMan.getBool("subtitles"))
    316318                        _systemVars.systemFlags |= SF_ALLOW_TEXT;
     319
     320                if (!ConfMan.getBool("speech_mute"))
     321                        _systemVars.systemFlags |= SF_ALLOW_SPEECH;
     322
    317323        } else
    318324                _systemVars.systemFlags |= SF_ALLOW_TEXT;
    319325