diff options
| author | Strangerke | 2014-03-15 11:19:21 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-15 11:19:21 +0100 |
| commit | 0a9b8978ee87039e32ad6348f90d9cc3a0227a47 (patch) | |
| tree | c5ebb07037eb25604a541129c28a33fc53bc18bb /engines | |
| parent | 62c4062841dd063118c1ac853a86e363184c1c68 (diff) | |
| download | scummvm-rg350-0a9b8978ee87039e32ad6348f90d9cc3a0227a47.tar.gz scummvm-rg350-0a9b8978ee87039e32ad6348f90d9cc3a0227a47.tar.bz2 scummvm-rg350-0a9b8978ee87039e32ad6348f90d9cc3a0227a47.zip | |
CGE: Remove a useless variable, remove some associated dead code
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cge/cge.cpp | 1 | ||||
| -rw-r--r-- | engines/cge/cge.h | 1 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 23 |
3 files changed, 2 insertions, 23 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 7459efe48c..3f7aa4abc9 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -104,7 +104,6 @@ CGEEngine::CGEEngine(OSystem *syst, const ADGameDescription *gameDescription) _now = 1; _lev = -1; _mode = 0; - _soundOk = 1; _gameCase2Cpt = 0; _offUseCount = 0; _volume[0] = 0; diff --git a/engines/cge/cge.h b/engines/cge/cge.h index 8c5ae29e18..1af9a90207 100644 --- a/engines/cge/cge.h +++ b/engines/cge/cge.h @@ -168,7 +168,6 @@ public: int _now; int _lev; int _mode; - int _soundOk; int _gameCase2Cpt; int _offUseCount; Dac *_bitmapPalette; diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 260fd8997a..b18bae64c8 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -397,7 +397,7 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt } } else { // Loading game - if (_soundOk == 1 && _mode == 0) { + if (_mode == 0) { // Skip Digital and Midi volumes, useless under ScummVM sndSetVolume(); } @@ -1483,25 +1483,6 @@ bool CGEEngine::showTitle(const char *name) { selectPocket(-1); _vga->sunrise(_vga->_sysPal); - if (_mode < 2 && !_soundOk) { - _vga->copyPage(1, 2); - _vga->copyPage(0, 1); - _vga->_showQ->append(_mouse); - _mouse->on(); - for (; !_commandHandler->idle() || Vmenu::_addr;) { - mainLoop(); - if (_quitFlag) - return false; - } - - _mouse->off(); - _vga->_showQ->clear(); - _vga->copyPage(0, 2); - _soundOk = 2; - if (_music) - _midiPlayer->loadMidi(0); - } - if (_mode < 2) { // At this point the game originally set the protection variables // used by the copy protection check @@ -1540,7 +1521,7 @@ void CGEEngine::cge_main() { if (_horzLine) _horzLine->_flags._hide = true; - if (_music && _soundOk) + if (_music) _midiPlayer->loadMidi(0); if (_startGameSlot != -1) { |