Mercurial > hg > openttd
changeset 4468:c9b95bfe4ab7 draft
(svn r6253) Comment out code with #if 0, not //. Join statements which needlessly span many lines into fewer lines
| author | tron <tron@openttd.org> |
|---|---|
| date | Thu, 31 Aug 2006 07:09:13 +0000 |
| parents | 7913fdd469c5 |
| children | 40f74bde42d3 |
| files | music_gui.c |
| diffstat | 1 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/music_gui.c +++ b/music_gui.c @@ -223,7 +223,9 @@ } DrawStringCentered(216, 45+8*6+16, STR_01F0_CLEAR, 0); - //DrawStringCentered(216, 45+8*6+16*2, STR_01F1_SAVE, 0); +#if 0 + DrawStringCentered(216, 45 + 8 * 6 + 16 * 2, STR_01F1_SAVE, 0); +#endif y = 23; for (p = _playlists[msf.playlist], i = 0; (i = *p) != 0; p++) { @@ -313,7 +315,9 @@ { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 186, 245, 76, 83, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 186, 245, 84, 91, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED}, { WWT_PUSHIMGBTN, RESIZE_NONE, 14, 186, 245, 108, 115, 0x0, STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1}, -//{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 186, 245, 124, 131, 0x0, STR_01F9_SAVE_MUSIC_SETTINGS}, +#if 0 +{ WWT_PUSHIMGBTN, RESIZE_NONE, 14, 186, 245, 124, 131, 0x0, STR_01F9_SAVE_MUSIC_SETTINGS}, +#endif { WIDGETS_END}, }; @@ -388,19 +392,13 @@ DrawFrameRect(108, 23, 174, 26, 14, FR_LOWERED); DrawFrameRect(214, 23, 280, 26, 14, FR_LOWERED); - DrawFrameRect(108 + (msf.music_vol>>1), - 22, - 111 + (msf.music_vol>>1), - 28, - 14, - 0); + DrawFrameRect( + 108 + msf.music_vol / 2, 22, 111 + msf.music_vol / 2, 28, 14, 0 + ); - DrawFrameRect(214 + (msf.effect_vol>>1), - 22, - 217 + (msf.effect_vol>>1), - 28, - 14, - 0); + DrawFrameRect( + 214 + msf.effect_vol / 2, 22, 217 + msf.effect_vol / 2, 28, 14, 0 + ); } break; case WE_CLICK: