diff options
| author | belugas <belugas@openttd.org> | 2007-06-15 23:55:52 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2007-06-15 23:55:52 +0000 |
| commit | 108ee9bc3e7645cad0e4977519ee56cef685fb7e (patch) | |
| tree | ef79fa77b3b91584c234b33bb2995df7ed57ad55 /src/player_gui.cpp | |
| parent | ef099dbc27fe513d8a915c23186179cde3f338c3 (diff) | |
| download | openttd-108ee9bc3e7645cad0e4977519ee56cef685fb7e.tar.xz | |
(svn r10167) -Codechange: Change the flagging system of grf loaded feature from a bitset to a bool evaluation.
Like easier to read and faster to evaluate :)
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 252b14572..694bc9a56 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -329,7 +329,7 @@ static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e) switch (e->event) { case WE_CREATE: LowerWindowWidget(w, WP(w, livery_d).livery_class + 2); - if (!HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { + if (!_loaded_newgrf_features.has_2CC) { HideWindowWidget(w, 11); HideWindowWidget(w, 12); } @@ -371,7 +371,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 (HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { + if (_loaded_newgrf_features.has_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); } @@ -799,7 +799,7 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e) } case PCW_WIDGET_COLOR_SCHEME: { - Window *wf = AllocateWindowDescFront(HASBIT(_loaded_newgrf_features, GRFLOADED_2CC) ? &_select_player_livery_2cc_desc : &_select_player_livery_desc, w->window_number); + Window *wf = AllocateWindowDescFront(_loaded_newgrf_features.has_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; |