diff options
| author | rubidium <rubidium@openttd.org> | 2010-11-13 09:56:25 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-11-13 09:56:25 +0000 |
| commit | 30637a8340844abce2aab469295b4160d1f2d532 (patch) | |
| tree | 9fd08dd8b612649aa6e27fa4f36ca4be3b587e97 /src/music_gui.cpp | |
| parent | 43f807a9189a1dde0260f40f8553bcc8050a3e1d (diff) | |
| download | openttd-30637a8340844abce2aab469295b4160d1f2d532.tar.xz | |
(svn r21157) -Codechange: remove information about the text direction out of the language "list"
Diffstat (limited to 'src/music_gui.cpp')
| -rw-r--r-- | src/music_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 45d03b0d5..740744e3e 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -580,9 +580,9 @@ struct MusicWindow : public Window { /* Hack-ish: set the proper widget data; only needs to be done once * per (Re)Init as that's the only time the language changes. */ - case MW_PREV: this->GetWidget<NWidgetCore>(MW_PREV)->widget_data = _dynlang.text_dir == TD_RTL ? SPR_IMG_SKIP_TO_NEXT : SPR_IMG_SKIP_TO_PREV; break; - case MW_NEXT: this->GetWidget<NWidgetCore>(MW_NEXT)->widget_data = _dynlang.text_dir == TD_RTL ? SPR_IMG_SKIP_TO_PREV : SPR_IMG_SKIP_TO_NEXT; break; - case MW_PLAY: this->GetWidget<NWidgetCore>(MW_PLAY)->widget_data = _dynlang.text_dir == TD_RTL ? SPR_IMG_PLAY_MUSIC_RTL : SPR_IMG_PLAY_MUSIC; break; + case MW_PREV: this->GetWidget<NWidgetCore>(MW_PREV)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_NEXT : SPR_IMG_SKIP_TO_PREV; break; + case MW_NEXT: this->GetWidget<NWidgetCore>(MW_NEXT)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_PREV : SPR_IMG_SKIP_TO_NEXT; break; + case MW_PLAY: this->GetWidget<NWidgetCore>(MW_PLAY)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_PLAY_MUSIC_RTL : SPR_IMG_PLAY_MUSIC; break; } } @@ -631,7 +631,7 @@ struct MusicWindow : public Window { DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED); byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol; int x = (volume * (r.right - r.left) / 127); - if (_dynlang.text_dir == TD_RTL) { + if (_current_text_dir == TD_RTL) { x = r.right - x; } else { x += r.left; @@ -684,7 +684,7 @@ struct MusicWindow : public Window { byte *vol = (widget == MW_MUSIC_VOL) ? &msf.music_vol : &msf.effect_vol; byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x; - if (_dynlang.text_dir == TD_RTL) new_vol = 127 - new_vol; + if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol; if (new_vol != *vol) { *vol = new_vol; if (widget == MW_MUSIC_VOL) MusicVolumeChanged(new_vol); |