[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.2,2.3 resource.cpp,1.29,1.30

Jamieson Christian jamieson630 at users.sourceforge.net
Wed Dec 18 06:58:03 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv18182/scummvm/scumm

Modified Files:
	imuse.cpp resource.cpp 
Log Message:
Fixed problems with instruments after load.
Ignore Adlib-only music when running native MIDI.
(Can't remember why I included them in the first place,
 so until I do remember, it's coming back out.)

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- imuse.cpp	18 Dec 2002 13:53:52 -0000	2.2
+++ imuse.cpp	18 Dec 2002 14:57:25 -0000	2.3
@@ -3242,6 +3242,7 @@
 	set_detune(_detune);
 	set_pri(_pri);
 	set_pan(_pan);
+	if (_program < 128) _instrument.program (_program, _player->_mt32emulate);
 	changed (IMuseDriver::pcAll);
 }
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- resource.cpp	5 Dec 2002 21:45:55 -0000	1.29
+++ resource.cpp	18 Dec 2002 14:57:25 -0000	1.30
@@ -608,7 +608,7 @@
 				pri = 15;
 				break;
 			case MKID('ADL '):
-				pri = 1;
+//				pri = 1;
 				if (_use_adlib)
 					pri = 10;
 				break;





More information about the Scummvm-git-logs mailing list