aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-01-28 03:01:28 +0000
committerTravis Howell2004-01-28 03:01:28 +0000
commit0e9e75da9d80fe124116d661b793f91781f6cbfb (patch)
treede1a0a1b9427806351e00be4708a7ca5b66ceeb0 /simon
parentd417394a25ccdca6b0ce44f33eef9c45b15082a3 (diff)
downloadscummvm-rg350-0e9e75da9d80fe124116d661b793f91781f6cbfb.tar.gz
scummvm-rg350-0e9e75da9d80fe124116d661b793f91781f6cbfb.tar.bz2
scummvm-rg350-0e9e75da9d80fe124116d661b793f91781f6cbfb.zip
music works on Simon2
svn-id: r12651
Diffstat (limited to 'simon')
-rw-r--r--simon/debugger.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/simon/debugger.cpp b/simon/debugger.cpp
index 6a529010c8..a11dc9d8c4 100644
--- a/simon/debugger.cpp
+++ b/simon/debugger.cpp
@@ -108,12 +108,13 @@ bool Debugger::Cmd_DebugLevel(int argc, const char **argv) {
bool Debugger::Cmd_PlayMusic(int argc, const char **argv) {
if (argc > 1) {
uint music = atoi(argv[1]);
- if (_vm->_game & GF_SIMON2)
- DebugPrintf("No support for Simon the Sorcerer 2\n");
- else if (music <= 34)
- _vm->loadMusic(music);
- else
- DebugPrintf("Music out of range (0 - 34)\n");
+ uint range = (_vm->_game & GF_SIMON2) ? 93 : 34;
+ if (music <= range) {
+ _vm->loadMusic (music);
+ if (_vm->_game & GF_SIMON2)
+ _vm->midi.startTrack (0);
+ } else
+ DebugPrintf("Music out of range (0 - %d)\n", range);
} else
DebugPrintf("Syntax: music <musicnum>\n");