Mercurial > hg > openttd
changeset 3052:18ff5a195447 draft
(svn r3641) - Rename MusicFilesettings 'btn_down' to more sensible 'playing'
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Mon, 20 Feb 2006 23:40:53 +0000 |
parents | 464ba6811ebc |
children | 7da563c4a183 |
files | music_gui.c settings.c sound.h |
diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/music_gui.c +++ b/music_gui.c @@ -182,9 +182,9 @@ void MusicLoop(void) { - if (!msf.btn_down && _song_is_active) { + if (!msf.playing && _song_is_active) { StopMusic(); - } else if (msf.btn_down && !_song_is_active) { + } else if (msf.playing && !_song_is_active) { PlayPlaylistSong(); } @@ -405,10 +405,10 @@ SkipToNextSong(); break; case 4: // stop playing - msf.btn_down = false; + msf.playing = false; break; case 5: // start playing - msf.btn_down = true; + msf.playing = true; break; case 6:{ // volume sliders byte *vol,new_vol;
--- a/settings.c +++ b/settings.c @@ -794,7 +794,7 @@ {"effect_vol",SDT_UINT8, (void*)128, &msf.effect_vol, NULL}, {"custom_1", SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_1) << 16, NULL, &msf.custom_1, NULL}, {"custom_2", SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_2) << 16, NULL, &msf.custom_2, NULL}, - {"playing", SDT_BOOL, (void*)true, &msf.btn_down, NULL}, + {"playing", SDT_BOOL, (void*)true, &msf.playing, NULL}, {"shuffle", SDT_BOOL, (void*)false, &msf.shuffle, NULL}, {"extmidi", SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL}, {NULL, 0, NULL, NULL, NULL}