aboutsummaryrefslogtreecommitdiff
path: root/simon/items.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-01-03 12:06:30 +0000
committerTravis Howell2003-01-03 12:06:30 +0000
commit3a4782f16656c180b48be4afa1270a7ec351ed72 (patch)
tree063280408ebd9536376aae69d6f2e7a9108a96ab /simon/items.cpp
parentf1365f4f2b861ecfed42dea4b534ee14eca245ac (diff)
downloadscummvm-rg350-3a4782f16656c180b48be4afa1270a7ec351ed72.tar.gz
scummvm-rg350-3a4782f16656c180b48be4afa1270a7ec351ed72.tar.bz2
scummvm-rg350-3a4782f16656c180b48be4afa1270a7ec351ed72.zip
Add olki's patch for sound effects in simon1dos
Plus hack to allow choice between midi music and sound effects via 's' key svn-id: r6326
Diffstat (limited to 'simon/items.cpp')
-rw-r--r--simon/items.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index c9903d6e68..8cd5ff67df 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1045,7 +1045,7 @@ int SimonState::runScript()
case 185:{
if (_game & GAME_SIMON2)
goto invalid_opcode;
- getVarOrWord();
+ _midi_sfx = getVarOrWord();
}
break;
@@ -1527,7 +1527,10 @@ void SimonState::o_unk_120(uint a)
void SimonState::o_unk_163(uint a)
{
- _sound->playEffects(a);
+ if (_game == GAME_SIMON1DOS)
+ playSting(a);
+ else
+ _sound->playEffects(a);
}
void SimonState::o_unk_160(uint a)