diff options
| author | Torbjörn Andersson | 2006-04-10 07:48:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-04-10 07:48:58 +0000 |
| commit | d76cbb843998d942292aa3a9ef84fb999d79c9da (patch) | |
| tree | cfa95e5f3ff72be4429273ed7de8ff0a2130aa25 | |
| parent | 2695cb6f88de69bb66f5f40cb936773736a85672 (diff) | |
| download | scummvm-rg350-d76cbb843998d942292aa3a9ef84fb999d79c9da.tar.gz scummvm-rg350-d76cbb843998d942292aa3a9ef84fb999d79c9da.tar.bz2 scummvm-rg350-d76cbb843998d942292aa3a9ef84fb999d79c9da.zip | |
Merged o_playSFX() into o1_playEffect().
svn-id: r21751
| -rw-r--r-- | engines/simon/items.cpp | 14 | ||||
| -rw-r--r-- | engines/simon/simon.h | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index a0e081bf31..5fb08d08ca 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1280,7 +1280,12 @@ void SimonEngine::o1_screenTextMsg() { void SimonEngine::o1_playEffect() { // 163: play sound - o_playSFX(getVarOrWord()); + uint sound_id = getVarOrWord(); + + if (getGameId() == GID_SIMON1DOS) + playSting(sound_id); + else + _sound->playEffects(sound_id); } void SimonEngine::o1_getDollar2() { @@ -1974,13 +1979,6 @@ void SimonEngine::o_sync(uint a) { _lockWord &= ~0x8000; } -void SimonEngine::o_playSFX(uint sound_id) { - if (getGameId() == GID_SIMON1DOS) - playSting(sound_id); - else - _sound->playEffects(sound_id); -} - void SimonEngine::o_setTextColor(uint color) { WindowBlock *window; diff --git a/engines/simon/simon.h b/engines/simon/simon.h index 40bfbc10b2..0a0ff062f5 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -583,7 +583,6 @@ protected: uint getOffsetOfChild2Param(SubObject *child, uint prop); void o_setTextColor(uint color); - void o_playSFX(uint a); void o_pathfind(int x, int y, uint var_1, uint var_2); void o_mouseOn(); void o_mouseOff(); |