[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.216,1.217

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv4638/simon

Modified Files:
	simon.cpp 
Log Message:

Small midi cleanup


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- simon.cpp	25 May 2003 03:19:21 -0000	1.216
+++ simon.cpp	25 May 2003 03:31:01 -0000	1.217
@@ -5299,20 +5299,6 @@
 			}
 			// TODO Add Protracker support for simon1amiga/cd32
 			warning("playMusic - Load %dtune attempt", music);
-		} else if (_game & GF_DEMO) {
-			midi.stop();
-			midi.setLoop (true);
-			char buf[50];
-			File *f = new File();
-			sprintf(buf, "MOD%d.MUS", music);
-			f->open(buf, _gameDataPath);
-			if (f->isOpen() == false) {
-				warning("Can't load music from '%s'", buf);
-				return;
-			}
-			midi.loadS1D (f);
-			delete f;
-			midi.startTrack (0);
 		} else {
 			midi.stop();
 			midi.setLoop (true); // Must do this BEFORE loading music. (GMF may have its own override.)
@@ -5340,7 +5326,10 @@
 					warning("Can't load music from '%s'", buf);
 					return;
 				}
-				midi.loadSMF (f, music);
+				if (_game & GF_DEMO)
+					midi.loadS1D (f);
+				else
+					midi.loadSMF (f, music);
 				delete f;
 			}