# HG changeset patch # User tron # Date 1099783212 0 # Node ID 9d0ac356488af3ffa0e5ad643d2491c4eeb4e752 # Parent 57ae229c5402ea122a189cb1f94334a7e54c8c61 (svn r517) -Fix: [1033947] Wrong mapping between music titles and songs diff -r 57ae229c5402 -r 9d0ac356488a music_gui.c --- a/music_gui.c Sat Nov 06 15:13:44 2004 +0000 +++ b/music_gui.c Sat Nov 06 23:20:12 2004 +0000 @@ -34,6 +34,32 @@ msf.custom_2, }; +// Map the order of the song names to the numbers of the midi filenames +static const int midi_idx[] = { + 0, // Tycoon DELUXE Theme + 2, // Easy Driver + 3, // Little Red Diesel + 17, // Cruise Control + 7, // Don't Walk! + 9, // Fell Apart On Me + 4, // City Groove + 19, // Funk Central + 6, // Stoke It + 12, // Road Hog + 5, // Aliens Ate My Railway + 1, // Snarl Up + 18, // Stroll On + 10, // Can't Get There From Here + 8, // Sawyer's Tune + 13, // Hold That Train! + 21, // Movin' On + 15, // Goss Groove + 16, // Small Town + 14, // Broomer's Oil Rag + 20, // Jammit + 11 // Hard Drivin' +}; + static void SkipToPrevSong() { @@ -82,7 +108,8 @@ static void DoPlaySong() { char filename[256]; - sprintf(filename, "%sgm_tt%.2d.gm", _path.gm_dir, _music_wnd_cursong - 1); + snprintf(filename, sizeof(filename), "%sgm_tt%.2d.gm", + _path.gm_dir, midi_idx[_music_wnd_cursong - 1]); _music_driver->play_song(filename); }