[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.161,1.162 scumm.h,1.304,1.305 scummvm.cpp,2.410,2.411

[Jamieson Christian]

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

Modified Files:
	resource.cpp scumm.h scummvm.cpp 
Log Message:
Fix for Bug [815851] DOTT: MT-32 MIDI priority

Favor 'ROL ' resources over 'GMD ' if
--native-mt32 is selected.

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- resource.cpp	30 Sep 2003 17:53:42 -0000	1.161
+++ resource.cpp	2 Oct 2003 14:37:40 -0000	1.162
@@ -747,6 +747,8 @@
 				break;
 			case MKID('ROL '):
 				pri = 3;
+				if (_native_mt32)
+					pri = 5;
 				break;
 			case MKID('GMD '):
 				pri = 4;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- scumm.h	24 Sep 2003 06:56:30 -0000	1.304
+++ scumm.h	2 Oct 2003 14:37:40 -0000	1.305
@@ -971,6 +971,7 @@
 	uint16 _defaultTalkDelay;
 	int tempMusic;
 	int _saveSound;
+	bool _native_mt32;
 public:
 	bool _silentDigitalImuse, _noDigitalSamples;
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.410
retrieving revision 2.411
diff -u -d -r2.410 -r2.411
--- scummvm.cpp	30 Sep 2003 16:36:00 -0000	2.410
+++ scummvm.cpp	2 Oct 2003 14:37:40 -0000	2.411
@@ -663,6 +663,7 @@
 	_confirmExit = detector->_confirmExit;
 	_defaultTalkDelay = detector->_talkSpeed;
 	_midiDriver = detector->_midi_driver;
+	_native_mt32 = detector->_native_mt32;
 	_language = detector->_language;
 	memset(&res, 0, sizeof(res));
 	_hexdumpScripts = false;