diff options
| author | belugas <belugas@openttd.org> | 2007-05-31 19:13:41 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2007-05-31 19:13:41 +0000 |
| commit | 4af692558a4e78e5b5b074f68adf3c60ff89d055 (patch) | |
| tree | 539e6a1d877b0459ab303b47d86cf1ac9c8c1e2f /src/player_gui.cpp | |
| parent | 01f80cf343918df3e9865cb272264ee3519154fa (diff) | |
| download | openttd-4af692558a4e78e5b5b074f68adf3c60ff89d055.tar.xz | |
(svn r10005) -Codechange: Merge two flags (2cc and newhouses) indicating some newgrf features have been loaded, and introduce the newindustry one.
Diffstat (limited to 'src/player_gui.cpp')
| -rw-r--r-- | src/player_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/player_gui.cpp b/src/player_gui.cpp index 7112a68a1..0c0eed216 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -324,7 +324,7 @@ static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e) switch (e->event) { case WE_CREATE: LowerWindowWidget(w, WP(w, livery_d).livery_class + 2); - if (!_have_2cc) { + if (!HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { HideWindowWidget(w, 11); HideWindowWidget(w, 12); } @@ -366,7 +366,7 @@ static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e) DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour1), 152, y); DrawString(165, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour1, sel ? 0xC : 2); - if (_have_2cc) { + if (HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour2), 277, y); DrawString(290, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour2, sel ? 0xC : 2); } @@ -794,7 +794,7 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) } case PCW_WIDGET_COLOR_SCHEME: { - Window *wf = AllocateWindowDescFront(_have_2cc ? &_select_player_livery_2cc_desc : &_select_player_livery_desc, w->window_number); + Window *wf = AllocateWindowDescFront(HASBIT(_loaded_newgrf_features, GRFLOADED_2CC) ? &_select_player_livery_2cc_desc : &_select_player_livery_desc, w->window_number); if (wf != NULL) { wf->caption_color = wf->window_number; WP(wf, livery_d).livery_class = LC_OTHER; |