--- /home/yonatyt/simu-git/simutrans-master/dataobj/environment.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/environment.cc 2020-05-16 07:28:12.577997827 -0400 @@ -146,6 +146,8 @@ uint32 env_t::tooltip_duration; sint8 env_t::show_money_message; +sint16 env_t::text_bright_player_color = 1; + std::string env_t::fontname = FONT_PATH_X "prop.fnt"; uint8 env_t::fontsize = 11; @@ -299,6 +301,8 @@ // env_t used to be called umgebung_t - keep old name when saving and loading for compatibility xml_tag_t u( file, "umgebung_t" ); + file->rdwr_short( text_bright_player_color ); + file->rdwr_short( scroll_multi ); file->rdwr_bool( night_shift ); file->rdwr_byte( daynight_level ); --- /home/yonatyt/simu-git/simutrans-master/dataobj/environment.h 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/environment.h 2020-05-16 07:28:24.064883626 -0400 @@ -223,6 +223,8 @@ static PIXVAL default_window_title_color; static uint8 bottom_window_darkness; + static sint16 text_bright_player_color; + // default font name and -size static std::string fontname; static uint8 fontsize; --- /home/yonatyt/simu-git/simutrans-master/simmesg.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/simmesg.cc 2020-05-16 07:27:29.754116718 -0400 @@ -52,7 +52,7 @@ FLAGGED_PIXVAL colorval = color; if( color&PLAYER_FLAG ) { player_t *player = welt->get_player(color&(~PLAYER_FLAG)); - colorval = player ? PLAYER_FLAG+color_idx_to_rgb(player->get_player_color1()+1) : color_idx_to_rgb(MN_GREY0); + colorval = player ? PLAYER_FLAG+color_idx_to_rgb(player->get_player_color1()+env_t::text_bright_player_color) : color_idx_to_rgb(MN_GREY0); } return colorval; } --- /home/yonatyt/simu-git/simutrans-master/gui/gui_theme.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/gui_theme.cc 2020-05-15 22:49:13.815504000 -0400 @@ -527,6 +527,8 @@ gui_theme_t::gui_drop_shadows = contents.get_int("gui_drop_shadows", gui_theme_t::gui_drop_shadows ); env_t::bottom_window_darkness = contents.get_int("bottom_window_darkness", env_t::bottom_window_darkness ); + env_t::text_bright_player_color = contents.get_int("text_bright_player_color", env_t::text_bright_player_color ); + env_t::default_window_title_color = contents.get_color("default_window_title_color", env_t::default_window_title_color, &env_t::default_window_title_color_rgb ); env_t::front_window_text_color = contents.get_color("front_window_text_color", env_t::front_window_text_color, &env_t::front_window_text_color_rgb ); env_t::bottom_window_text_color = contents.get_color("bottom_window_text_color", env_t::bottom_window_text_color, &env_t::bottom_window_text_color_rgb ); --- /home/yonatyt/simu-git/simutrans-master/gui/citylist_frame_t.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/citylist_frame_t.cc 2020-05-16 07:29:36.916409529 -0400 @@ -79,8 +79,7 @@ class playername_const_scroll_item_t : public gui_scrolled_list_t::const_text_scrollitem_t { public: const uint8 player_nr; - - playername_const_scroll_item_t( player_t *pl ) : gui_scrolled_list_t::const_text_scrollitem_t( pl->get_name(), color_idx_to_rgb(pl->get_player_color1()+3) ), player_nr(pl->get_player_nr()) { } + playername_const_scroll_item_t( player_t *pl ) : gui_scrolled_list_t::const_text_scrollitem_t( pl->get_name(), color_idx_to_rgb(pl->get_player_color1()+env_t::text_bright_player_color) ), player_nr(pl->get_player_nr()) { } }; --- /home/yonatyt/simu-git/simutrans-master/gui/display_settings.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/display_settings.cc 2020-05-16 07:30:06.147217042 -0400 @@ -60,8 +60,7 @@ void draw(scr_coord offset) OVERRIDE { scr_coord p = pos + offset; - - FLAGGED_PIXVAL pc = welt->get_active_player() ? color_idx_to_rgb(welt->get_active_player()->get_player_color1()+4) : color_idx_to_rgb(COL_ORANGE); + FLAGGED_PIXVAL pc = welt->get_active_player() ? color_idx_to_rgb(welt->get_active_player()->get_player_color1()+env_t::text_bright_player_color) : color_idx_to_rgb(COL_ORANGE); const char *text = get_text_pointer(); switch( env_t::show_names >> 2 ) { --- /home/yonatyt/simu-git/simutrans-master/gui/factorylist_frame_t.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/factorylist_frame_t.cc 2020-05-16 07:30:22.919676741 -0400 @@ -8,6 +8,8 @@ #include "../dataobj/translator.h" #include "../player/simplay.h" +#include "../dataobj/environment.h" + const char *factorylist_frame_t::sort_text[factorylist::SORT_MODES] = { "Fabrikname", @@ -21,8 +23,7 @@ class playername_const_scroll_item_t : public gui_scrolled_list_t::const_text_scrollitem_t { public: const uint8 player_nr; - - playername_const_scroll_item_t( player_t *pl ) : gui_scrolled_list_t::const_text_scrollitem_t( pl->get_name(), color_idx_to_rgb(pl->get_player_color1()+3) ), player_nr(pl->get_player_nr()) { } + playername_const_scroll_item_t( player_t *pl ) : gui_scrolled_list_t::const_text_scrollitem_t( pl->get_name(), color_idx_to_rgb(pl->get_player_color1()+env_t::text_bright_player_color) ), player_nr(pl->get_player_nr()) { } }; factorylist_frame_t::factorylist_frame_t() : --- /home/yonatyt/simu-git/simutrans-master/gui/labellist_stats_t.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/labellist_stats_t.cc 2020-05-16 07:31:01.286860664 -0400 @@ -12,6 +12,8 @@ #include "../utils/simstring.h" #include "../utils/cbuffer_t.h" +#include "../dataobj/environment.h" + labellist::sort_mode_t labellist_stats_t::sortby = labellist::by_name; bool labellist_stats_t::sortreverse = false; @@ -74,7 +76,7 @@ label.update(); if (const label_t *lb = get_label()) { - label.set_color(PLAYER_FLAG | color_idx_to_rgb(lb->get_owner()->get_player_color1())); + label.set_color(PLAYER_FLAG | color_idx_to_rgb(lb->get_owner()->get_player_color1()+env_t::text_bright_player_color)); } } --- /home/yonatyt/simu-git/simutrans-master/gui/map_frame.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/map_frame.cc 2020-05-16 00:41:49.011933000 -0400 @@ -254,7 +254,7 @@ viewable_players[ 0 ] = -1; for( int np = 0, count = 1; np < MAX_PLAYER_COUNT; np++ ) { if( welt->get_player( np ) && welt->get_player( np )->get_finance()->has_convoi()) { - viewed_player_c.new_component(welt->get_player( np )->get_name(), color_idx_to_rgb(welt->get_player( np )->get_player_color1()+4)); + viewed_player_c.new_component(welt->get_player( np )->get_name(), color_idx_to_rgb(welt->get_player( np )->get_player_color1()+env_t::text_bright_player_color)); viewable_players[ count++ ] = np; } } --- /home/yonatyt/simu-git/simutrans-master/gui/simwin.cc 2020-05-15 11:17:26.000000000 -0400 +++ /home/yonatyt/simu-git/files/simwin.cc 2020-05-16 07:33:10.051315384 -0400 @@ -1798,7 +1798,7 @@ if(wl->get_active_player()) { char buffer[256]; - display_proportional_rgb( middle-5, status_bar_text_y, wl->get_active_player()->get_name(), ALIGN_RIGHT, PLAYER_FLAG|color_idx_to_rgb(wl->get_active_player()->get_player_color1()+0), true); + display_proportional_rgb( middle-5, status_bar_text_y, wl->get_active_player()->get_name(), ALIGN_RIGHT, PLAYER_FLAG|color_idx_to_rgb(wl->get_active_player()->get_player_color1()+env_t::text_bright_player_color), true); money_to_string(buffer, konto ); display_proportional_rgb( middle+5, status_bar_text_y, buffer, ALIGN_LEFT, konto >= 0.0?MONEY_PLUS:MONEY_MINUS, true); }