[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.553,1.554 simon.h,1.173,1.174
Max Horn
fingolfin at users.sourceforge.net
Thu Dec 29 13:22:02 CET 2005
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv868
Modified Files:
simon.cpp simon.h
Log Message:
cleanup
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -d -r1.553 -r1.554
--- simon.cpp 13 Dec 2005 00:20:11 -0000 1.553
+++ simon.cpp 29 Dec 2005 21:21:16 -0000 1.554
@@ -556,19 +556,21 @@
// Setup midi driver
MidiDriver *driver = 0;
- _midiDriver = MD_NULL;
- if (getPlatform() == Common::kPlatformAmiga)
+ if (getPlatform() == Common::kPlatformAmiga) {
driver = MidiDriver::createMidi(MD_NULL); // Create fake MIDI driver for Simon1Amiga and Simon2CD32 for now
- else {
- _midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE);
- driver = MidiDriver::createMidi(_midiDriver);
+ _native_mt32 = false;
+ } else {
+ int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE);
+ driver = MidiDriver::createMidi(midiDriver);
+ _native_mt32 = (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32));
}
if (!driver)
driver = MidiDriver_ADLIB_create(_mixer);
- else if (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))
+ else if (_native_mt32) {
driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
+ }
- midi.mapMT32toGM (getGameType() == GType_SIMON1 && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)));
+ midi.mapMT32toGM (getGameType() == GType_SIMON1 && !_native_mt32);
midi.set_driver(driver);
int ret = midi.open();
@@ -623,7 +625,7 @@
#endif
TABLES_MEM_SIZE = 100000;
// Check whether to use MT-32 MIDI tracks in Simon the Sorcerer 2
- if ((getGameType() == GType_SIMON2) && (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)))
+ if ((getGameType() == GType_SIMON2) && _native_mt32)
MUSIC_INDEX_BASE = (1128 + 612) / 4;
else
MUSIC_INDEX_BASE = 1128 / 4;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- simon.h 13 Dec 2005 00:20:11 -0000 1.173
+++ simon.h 29 Dec 2005 21:21:16 -0000 1.174
@@ -401,7 +401,7 @@
byte _lettersToPrintBuf[80];
MidiPlayer midi;
- int _midiDriver;
+ bool _native_mt32;
int _numScreenUpdates;
int _vgaTickCounter;
More information about the Scummvm-git-logs
mailing list