diff options
| author | Strangerke | 2011-09-04 11:23:01 +0200 |
|---|---|---|
| committer | Strangerke | 2011-09-04 11:23:01 +0200 |
| commit | 56e57cf3807642ceff2460c255322325c779fb2e (patch) | |
| tree | 7c62b56f384d8d03da1be603dc99177720769fa1 /engines | |
| parent | 690d94eb0376252818b5c27e86e0c70a6d01435d (diff) | |
| download | scummvm-rg350-56e57cf3807642ceff2460c255322325c779fb2e.tar.gz scummvm-rg350-56e57cf3807642ceff2460c255322325c779fb2e.tar.bz2 scummvm-rg350-56e57cf3807642ceff2460c255322325c779fb2e.zip | |
CGE: Remove two useless callback types
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cge/cge.h | 3 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 26 | ||||
| -rw-r--r-- | engines/cge/snail.cpp | 6 |
3 files changed, 6 insertions, 29 deletions
diff --git a/engines/cge/cge.h b/engines/cge/cge.h index 2ad66fc74a..edb396f4cf 100644 --- a/engines/cge/cge.h +++ b/engines/cge/cge.h @@ -64,8 +64,7 @@ enum SnList { }; enum CallbackType { - kNullCB = 0, kQGame, kMiniStep, kXCave, kSelectSound, - kSnSelect, kSndSetVolume + kNullCB = 0, kQGame, kMiniStep, kXCave, kSndSetVolume }; struct SavegameHeader { diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index aa332ed8ea..5ccf681f96 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -716,18 +716,9 @@ void System::touch(uint16 mask, int x, int y) { return; } switch (x) { - case 'F': - if (_keyboard->_key[kKeyAlt]) { - Sprite *m = _vga->_showQ->locate(17001); - if (m) { - m->step(1); - m->_time = 216; // 3s - } - } - break; case 'X': if (_keyboard->_key[kKeyAlt]) - _finis = true; + _vm->quit(); break; case '0': case '1': @@ -738,6 +729,7 @@ void System::touch(uint16 mask, int x, int y) { _snail->addCom(kSnLevel, -1, x - '0', NULL); break; } + break; } } else { if (_vm->_startupMode) @@ -821,17 +813,9 @@ void CGEEngine::switchColorMode() { void CGEEngine::switchMusic() { debugC(1, kCGEDebugEngine, "CGEEngine::switchMusic()"); - if (_keyboard->_key[kKeyAlt]) { - if (Vmenu::_addr) { - _snail_->addCom(kSnKill, -1, 0, Vmenu::_addr); - } else { - _snail_->addCom(kSnSeq, 122, (_music = false), NULL); - _snail->addCom2(kSnExec, -1, 0, kSelectSound); - } - } else { - _snail_->addCom(kSnSeq, 122, (_music = !_music), NULL); - keyClick(); - } + _snail_->addCom(kSnSeq, 122, (_music = !_music), NULL); + keyClick(); + if (_music) _midiPlayer.loadMidi(_now); else diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 0e9d834d17..bffbe7c628 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -1139,12 +1139,6 @@ void Snail::runCom() { case kXCave: _vm->xCave(); break; - case kSelectSound: - warning("TODO: Select sound card"); - break; - case kSnSelect: - warning("TODO: Sound card selection"); - break; case kSndSetVolume: sndSetVolume(); break; |