summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-09-01 21:35:28 +0000
committeryexo <yexo@openttd.org>2009-09-01 21:35:28 +0000
commite78da26f3cb740c15ebdf8363afc9af6b7caa65b (patch)
treeb071fbdcb42ea85eb4c8e74b6732ee12bf6d63ed
parentf3d2be7581420baf219779c9bdd491ac81ab8bd7 (diff)
downloadopenttd-e78da26f3cb740c15ebdf8363afc9af6b7caa65b.tar.xz
(svn r17361) -Fix (r17360): committed a bit too much
-rw-r--r--src/music_gui.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 3c64c8842..6d74c5d5d 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -510,12 +510,7 @@ struct MusicWindow : public Window {
DrawString(r.left, r.right, r.top + 1, (widget == MW_MUSIC_VOL) ? STR_MUSIC_MUSIC_VOLUME : STR_MUSIC_EFFECTS_VOLUME, TC_FROMSTRING, SA_CENTER);
int y = (r.top + r.bottom - slider_bar_height) / 2;
DrawFrameRect(r.left, y, r.right, y + slider_bar_height, COLOUR_GREY, FR_LOWERED);
- DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MIN, TC_FROMSTRING, SA_LEFT);
- DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MAX, TC_FROMSTRING, SA_RIGHT);
- for (int i = 0; i <= 10; i++) {
- int x = r.left + (r.right - r.left) * i / 10;
- DrawFrameRect(x, y + slider_bar_height, x, y + slider_bar_height + 2, COLOUR_DARK_BLUE, FR_NONE);
- }
+ DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MIN_MAX_RULER, TC_FROMSTRING, SA_CENTER);
y = (r.top + r.bottom - slider_height) / 2;
byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol;
int x = r.left + (volume * (r.right - r.left) / 127);