CGE: Remove a useless variable, remove some associated dead code

This commit is contained in:
Strangerke 2014-03-15 11:19:21 +01:00
parent 62c4062841
commit 0a9b8978ee
3 changed files with 2 additions and 23 deletions

View File

@ -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;

View File

@ -168,7 +168,6 @@ public:
int _now;
int _lev;
int _mode;
int _soundOk;
int _gameCase2Cpt;
int _offUseCount;
Dac *_bitmapPalette;

View File

@ -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) {