thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Old targets will be auto updated.

Browse source 
Many non-English versions will be broken until information is updated.

svn-id: r19563
This commit is contained in:
Travis Howell 2005-11-12 06:01:24 +00:00
parent 5496f91269
commit b4908f449e
18 changed files with 1182 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

8
simon/debugger.cpp
View file

@ -106,10 +106,10 @@ 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]);
uint range = (_vm->_game & GF_SIMON2) ? 93 : 34;
uint range = (_vm->getGameType() == GType_SIMON2) ? 93 : 34;
if (music <= range) {
_vm->loadMusic (music);
if (_vm->_game & GF_SIMON2)
if (_vm->getGameType() == GType_SIMON2)
_vm->midi.startTrack (0);
} else
DebugPrintf("Music out of range (0 - %d)\n", range);
@ -122,7 +122,7 @@ bool Debugger::Cmd_PlayMusic(int argc, const char **argv) {
bool Debugger::Cmd_PlaySound(int argc, const char **argv) {
if (argc > 1) {
uint sound = atoi(argv[1]);
uint range = (_vm->_game & GF_SIMON2) ? 222 : 127;
uint range = (_vm->getGameType() == GType_SIMON2) ? 222 : 127;
if (sound <= range)
_vm->_sound->playEffects(sound);
else
@ -136,7 +136,7 @@ bool Debugger::Cmd_PlaySound(int argc, const char **argv) {
bool Debugger::Cmd_PlayVoice(int argc, const char **argv) {
if (argc > 1) {
uint voice = atoi(argv[1]);
uint range = (_vm->_game & GF_SIMON2) ? 3632 : 1996;
uint range = (_vm->getGameType() == GType_SIMON2) ? 3632 : 1996;
if (voice <= range)
_vm->_sound->playVoice(voice);
else