equal
deleted
inserted
replaced
322 static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e) |
322 static void SelectPlayerLiveryWndProc(Window *w, WindowEvent *e) |
323 { |
323 { |
324 switch (e->event) { |
324 switch (e->event) { |
325 case WE_CREATE: |
325 case WE_CREATE: |
326 LowerWindowWidget(w, WP(w, livery_d).livery_class + 2); |
326 LowerWindowWidget(w, WP(w, livery_d).livery_class + 2); |
327 if (!_have_2cc) { |
327 if (!HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { |
328 HideWindowWidget(w, 11); |
328 HideWindowWidget(w, 11); |
329 HideWindowWidget(w, 12); |
329 HideWindowWidget(w, 12); |
330 } |
330 } |
331 break; |
331 break; |
332 |
332 |
364 DrawString(15, y, STR_LIVERY_DEFAULT + scheme, sel ? 0xC : 0x10); |
364 DrawString(15, y, STR_LIVERY_DEFAULT + scheme, sel ? 0xC : 0x10); |
365 |
365 |
366 DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour1), 152, y); |
366 DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour1), 152, y); |
367 DrawString(165, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour1, sel ? 0xC : 2); |
367 DrawString(165, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour1, sel ? 0xC : 2); |
368 |
368 |
369 if (_have_2cc) { |
369 if (HASBIT(_loaded_newgrf_features, GRFLOADED_2CC)) { |
370 DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour2), 277, y); |
370 DrawSprite(SPR_SQUARE, GENERAL_SPRITE_COLOR(p->livery[scheme].colour2), 277, y); |
371 DrawString(290, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour2, sel ? 0xC : 2); |
371 DrawString(290, y, STR_00D1_DARK_BLUE + p->livery[scheme].colour2, sel ? 0xC : 2); |
372 } |
372 } |
373 |
373 |
374 y += 14; |
374 y += 14; |
792 } |
792 } |
793 break; |
793 break; |
794 } |
794 } |
795 |
795 |
796 case PCW_WIDGET_COLOR_SCHEME: { |
796 case PCW_WIDGET_COLOR_SCHEME: { |
797 Window *wf = AllocateWindowDescFront(_have_2cc ? &_select_player_livery_2cc_desc : &_select_player_livery_desc, w->window_number); |
797 Window *wf = AllocateWindowDescFront(HASBIT(_loaded_newgrf_features, GRFLOADED_2CC) ? &_select_player_livery_2cc_desc : &_select_player_livery_desc, w->window_number); |
798 if (wf != NULL) { |
798 if (wf != NULL) { |
799 wf->caption_color = wf->window_number; |
799 wf->caption_color = wf->window_number; |
800 WP(wf, livery_d).livery_class = LC_OTHER; |
800 WP(wf, livery_d).livery_class = LC_OTHER; |
801 WP(wf, livery_d).sel = 1; |
801 WP(wf, livery_d).sel = 1; |
802 LowerWindowWidget(wf, 2); |
802 LowerWindowWidget(wf, 2); |