diff options
| author | Strangerke | 2011-07-25 19:09:12 +0200 |
|---|---|---|
| committer | Strangerke | 2011-07-25 19:09:12 +0200 |
| commit | dad302b640524224cb9381b3cfdcac7f430f0b21 (patch) | |
| tree | b9f39c75f60c660783eb23b91745009ebae1cf18 /engines/cge/cge_main.cpp | |
| parent | 2e5a041046f69378da87fb8cab805fdee31a01e2 (diff) | |
| download | scummvm-rg350-dad302b640524224cb9381b3cfdcac7f430f0b21.tar.gz scummvm-rg350-dad302b640524224cb9381b3cfdcac7f430f0b21.tar.bz2 scummvm-rg350-dad302b640524224cb9381b3cfdcac7f430f0b21.zip | |
CGE: Remove _core from Startup class
Diffstat (limited to 'engines/cge/cge_main.cpp')
| -rw-r--r-- | engines/cge/cge_main.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 60500b2b0e..3bffa1f732 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -335,9 +335,6 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt } } else { // Loading game - if (Startup::_core < CORE_HIG) - _music = false; - if (Startup::_soundOk == 1 && Startup::_mode == 0) { // _sndDrvInfo.Vol2._d = _volume[0]; // _sndDrvInfo.Vol2._m = _volume[1]; @@ -888,7 +885,7 @@ void System::tick() { if (_snail->idle()) { if (PAIN) _vm->heroCover(9); - else if (Startup::_core >= CORE_MID) { + else { // CHECKME: Before, was: if (Startup::_core >= CORE_MID) { int n = new_random(100); if (n > 96) _vm->heroCover(6 + (_hero->_x + _hero->_w / 2 < kScrWidth / 2)); @@ -928,12 +925,8 @@ void CGEEngine::switchMusic() { _snail->addCom2(kSnExec, -1, 0, kSelectSound); } } else { - if (Startup::_core < CORE_HIG) - _snail->addCom(kSnInf, -1, kNoMusic, NULL); - else { - _snail_->addCom(kSnSeq, 122, (_music = !_music), NULL); - keyClick(); - } + _snail_->addCom(kSnSeq, 122, (_music = !_music), NULL); + keyClick(); } if (_music) loadMidi(_now); |