[Scummvm-cvs-logs] CVS: scummvm/simon debugger.cpp,1.8,1.9

Travis Howell kirben at users.sourceforge.net
Tue Jan 27 19:04:05 CET 2004


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19685/simon

Modified Files:
	debugger.cpp 
Log Message:

music works on Simon2


Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debugger.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debugger.cpp	28 Jan 2004 02:45:00 -0000	1.8
+++ debugger.cpp	28 Jan 2004 03:01:28 -0000	1.9
@@ -108,12 +108,13 @@
 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");
 





More information about the Scummvm-git-logs mailing list