From: <do...@us...> - 2013-04-12 08:56:04
|
Revision: 7380 http://exult.svn.sourceforge.net/exult/?rev=7380&view=rev Author: dominus Date: 2013-04-12 08:55:57 +0000 (Fri, 12 Apr 2013) Log Message: ----------- only allow background sfx tracks for oggs and MT32Emu. The tracks do not play nicely for normal midi devices. Should probably be allowed for MT32 and FakeMT32 conversions as well. Modified Paths: -------------- exult/trunk/ChangeLog exult/trunk/gamewin.cc Modified: exult/trunk/ChangeLog =================================================================== --- exult/trunk/ChangeLog 2013-04-11 23:04:33 UTC (rev 7379) +++ exult/trunk/ChangeLog 2013-04-12 08:55:57 UTC (rev 7380) @@ -1,6 +1,9 @@ 2013-04-12 Dominik Reichardt <do...@us...> * schedule.cc: fixed looping change of patrol schedule to patrol in SI, setting it to loiter instead if preset schedule is patrol or if there are no presets. + * gamewin.cc: only allow background sfx tracks for oggs and MT32Emu. The tracks + do not play nicely for normal midi devices. Should probably be allowed for + MT32 and FakeMT32 conversions as well. 2013-04-03 Dominik Reichardt <do...@us...> * usecode/ucinternal.cc: reverted fix for "error case of opcode CALLMS" of Modified: exult/trunk/gamewin.cc =================================================================== --- exult/trunk/gamewin.cc 2013-04-11 23:04:33 UTC (rev 7379) +++ exult/trunk/gamewin.cc 2013-04-12 08:55:57 UTC (rev 7380) @@ -189,10 +189,10 @@ currentstate = Outside; MyMidiPlayer *player = Audio::get_ptr()->get_midi(); - // Lets allow this for midi music too. It might be best to restrict this to - // MT32 or MT32Emu, but I won't worry about it yet. - //if (player && player->get_ogg_enabled()) - if (player) { + // Lets allow this for Digital Muisc and MT32Emu only. + // Probably should be allowed for MT32 conversion as well. + // if (player) { + if (player && (player->get_ogg_enabled() || player->get_midi_driver() == "mt32emu")) { delay = 1000; //Quickly get back to this function check //We've got OGG so play the background SFX tracks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |