diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cf934ad3e..2b5c1e714 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -7,6 +7,7 @@ editor/meddraw.c: Set edge_list_size to Num_segments*12 to avoid crashes in the 2d/gpixel.c, arch/ogl/gr.c, editor/meddraw.c, include/ogl_init.h, main/multi.c, main/render.c: Clicking on mine elements in the editor now works in ogl editor/centers.c: Create a centers dialog that won't crash main/bmread.c, main/game.c, main/gameseq.c, main/gameseq.h, main/gauges.c, main/kmatrix.c, main/multi.c, main/multi.h, main/net_udp.c, main/state.c: Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition +misc/hmp.c: Addition for last change in hmp_reset(): execute midiOutShortMsg() even if midiOutPrepareHeader() fails as not related to SysEx part 20120414 -------- diff --git a/misc/hmp.c b/misc/hmp.c index 3c892c9fa..f2ddfb44f 100644 --- a/misc/hmp.c +++ b/misc/hmp.c @@ -588,9 +588,6 @@ void hmp_reset() midiOutUnprepareHeader(hmidi, &mhdr, sizeof(MIDIHDR)); timer_delay(F1_0/20); - - for (channel = 0; channel < 16; channel++) - midiOutShortMsg(hmidi, (DWORD)(channel | MIDI_CONTROL_CHANGE << 4 | MIDI_VOLUME << 8 | (100 * midi_volume / MIDI_VOLUME_SCALE) << 16)); } else { @@ -610,6 +607,9 @@ void hmp_reset() break; } } + + for (channel = 0; channel < 16; channel++) + midiOutShortMsg(hmidi, (DWORD)(channel | MIDI_CONTROL_CHANGE << 4 | MIDI_VOLUME << 8 | (100 * midi_volume / MIDI_VOLUME_SCALE) << 16)); midiOutClose(hmidi); } #endif