diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-19 13:56:10 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-19 13:56:10 +0000 |
| commit | 8e201585e6b4f9b74c851e1d2e4221352e7e22d0 (patch) | |
| tree | 6ea92f5d2c7fde499914c9f0decf05cc00b39afe /src/music_gui.cpp | |
| parent | 2f0b1ef5f136bd32fd7be8253c034048e59a490e (diff) | |
| download | openttd-8e201585e6b4f9b74c851e1d2e4221352e7e22d0.tar.xz | |
(svn r18182) -Codechange: use the zero fill control code instead of duplicating strings with 'only' the 0 differing
Diffstat (limited to 'src/music_gui.cpp')
| -rw-r--r-- | src/music_gui.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 8ff9f1624..9f3a86d9b 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -270,9 +270,10 @@ struct MusicTrackSelectionWindow : public Window { for (uint i = 1; i <= NUM_SONGS_AVAILABLE; i++) { SetDParam(0, i); - SetDParam(2, i); - SetDParam(1, SPECSTR_SONGNAME); - Dimension d2 = GetStringBoundingBox((i < 10) ? STR_PLAYLIST_TRACK_SINGLE_DIGIT : STR_PLAYLIST_TRACK_DOUBLE_DIGIT); + SetDParam(1, 2); + SetDParam(2, SPECSTR_SONGNAME); + SetDParam(3, i); + Dimension d2 = GetStringBoundingBox(STR_PLAYLIST_TRACK_NAME); d.width = max(d.width, d2.width); d.height += d2.height; } @@ -292,9 +293,10 @@ struct MusicTrackSelectionWindow : public Window { int y = r.top + WD_FRAMERECT_TOP; for (uint i = 1; i <= NUM_SONGS_AVAILABLE; i++) { SetDParam(0, i); - SetDParam(2, i); - SetDParam(1, SPECSTR_SONGNAME); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, (i < 10) ? STR_PLAYLIST_TRACK_SINGLE_DIGIT : STR_PLAYLIST_TRACK_DOUBLE_DIGIT); + SetDParam(1, 2); + SetDParam(2, SPECSTR_SONGNAME); + SetDParam(3, i); + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_PLAYLIST_TRACK_NAME); y += FONT_HEIGHT_SMALL; } } break; @@ -306,9 +308,10 @@ struct MusicTrackSelectionWindow : public Window { for (const byte *p = _playlists[msf.playlist]; *p != 0; p++) { uint i = *p; SetDParam(0, i); - SetDParam(1, SPECSTR_SONGNAME); - SetDParam(2, i); - DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, (i < 10) ? STR_PLAYLIST_TRACK_SINGLE_DIGIT : STR_PLAYLIST_TRACK_DOUBLE_DIGIT); + SetDParam(1, 2); + SetDParam(2, SPECSTR_SONGNAME); + SetDParam(3, i); + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_PLAYLIST_TRACK_NAME); y += FONT_HEIGHT_SMALL; } } break; @@ -516,7 +519,8 @@ struct MusicWindow : public Window { StringID str = STR_MUSIC_TRACK_NONE; if (_song_is_active != 0 && _music_wnd_cursong != 0) { SetDParam(0, _music_wnd_cursong); - str = (_music_wnd_cursong < 10) ? STR_MUSIC_TRACK_SINGLE_DIGIT : STR_MUSIC_TRACK_DOUBLE_DIGIT; + SetDParam(0, 2); + str = STR_MUSIC_TRACK_DIGIT; } DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str); } break; |