dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r22429) -Add: some constants for specific palette colours used in the GUI.

Browse Source
This commit is contained in:
frosch
2011-05-06 21:13:29 +00:00
parent b339fdae41
commit 7b251297c9
21 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/music_gui.cpp
View File

@@ -370,7 +370,7 @@ struct MusicTrackSelectionWindow : public Window {
{
switch (widget) {
case MTSW_LIST_LEFT: {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, GREY_SCALE(0));
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK);
int y = r.top + WD_FRAMERECT_TOP;
for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) {
@@ -387,7 +387,7 @@ struct MusicTrackSelectionWindow : public Window {
}
case MTSW_LIST_RIGHT: {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, GREY_SCALE(0));
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK);
int y = r.top + WD_FRAMERECT_TOP;
for (const byte *p = _playlists[_settings_client.music.playlist]; *p != 0; p++) {
@@ -592,14 +592,14 @@ struct MusicWindow : public Window {
{
switch (widget) {
case MW_GAUGE:
GfxFillRect(r.left, r.top, r.right, r.bottom, GREY_SCALE(0));
GfxFillRect(r.left, r.top, r.right, r.bottom, PC_BLACK);
for (uint i = 0; i != 8; i++) {
int colour = 0xD0;
int colour = PC_GREEN;
if (i > 4) {
colour = 0xBF;
colour = PC_YELLOW;
if (i > 6) {
colour = 0xB8;
colour = PC_RED;
}
}
GfxFillRect(r.left, r.bottom - i * 2, r.right, r.bottom - i * 2, colour);
@@ -607,7 +607,7 @@ struct MusicWindow : public Window {
break;
case MW_TRACK_NR: {
GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, GREY_SCALE(0));
GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, PC_BLACK);
StringID str = STR_MUSIC_TRACK_NONE;
if (_song_is_active != 0 && _music_wnd_cursong != 0) {
SetDParam(0, GetTrackNumber(_music_wnd_cursong - 1));
@@ -619,7 +619,7 @@ struct MusicWindow : public Window {
}
case MW_TRACK_NAME: {
GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, GREY_SCALE(0));
GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, PC_BLACK);
StringID str = STR_MUSIC_TITLE_NONE;
if (_song_is_active != 0 && _music_wnd_cursong != 0) {
str = STR_MUSIC_TITLE_NAME;