Index: gui/halt_info.cc =================================================================== --- gui/halt_info.cc (revision 9155) +++ gui/halt_info.cc (working copy) @@ -329,7 +329,19 @@ } } end_table(); - add_component(&lb_happy); + // happy / unhappy / no route + add_table(6,1); + { + add_component(&lb_happy[0]); + if (skinverwaltung_t::happy && skinverwaltung_t::unhappy && skinverwaltung_t::no_route) { + new_component(skinverwaltung_t::happy->get_image_id(0), 0, ALIGN_NONE, true); + add_component(&lb_happy[1]); + new_component(skinverwaltung_t::unhappy->get_image_id(0), 0, ALIGN_NONE, true); + add_component(&lb_happy[2]); + new_component(skinverwaltung_t::no_route->get_image_id(0), 0, ALIGN_NONE, true); + } + } + end_table(); } end_table(); @@ -439,16 +451,26 @@ lb_capacity[2].buf().printf(" %u", halt->get_capacity(2)); lb_capacity[2].update(); - if( has_character( 0x263A ) ) { - utf8 happy[4], unhappy[4]; - happy[ utf16_to_utf8( 0x263A, happy ) ] = 0; - unhappy[ utf16_to_utf8( 0x2639, unhappy ) ] = 0; - lb_happy.buf().printf(translator::translate("Passengers %d %s, %d %s, %d no route"), halt->get_pax_happy(), happy, halt->get_pax_unhappy(), unhappy, halt->get_pax_no_route()); + if (skinverwaltung_t::happy && skinverwaltung_t::unhappy && skinverwaltung_t::no_route) { + lb_happy[0].buf().printf("%s: %u", translator::translate("Passagiere"), halt->get_pax_happy()); + lb_happy[0].update(); + lb_happy[1].buf().printf(" %u", halt->get_pax_unhappy()); + lb_happy[1].update(); + lb_happy[2].buf().printf(" %u", halt->get_pax_no_route()); + lb_happy[2].update(); } else { - lb_happy.buf().printf(translator::translate("Passengers %d %c, %d %c, %d no route"), halt->get_pax_happy(), 30, halt->get_pax_unhappy(), 31, halt->get_pax_no_route()); + if( has_character( 0x263A ) ) { + utf8 happy[4], unhappy[4]; + happy[ utf16_to_utf8( 0x263A, happy ) ] = 0; + unhappy[ utf16_to_utf8( 0x2639, unhappy ) ] = 0; + lb_happy[0].buf().printf(translator::translate("Passengers %d %s, %d %s, %d no route"), halt->get_pax_happy(), happy, halt->get_pax_unhappy(), unhappy, halt->get_pax_no_route()); + } + else { + lb_happy[0].buf().printf(translator::translate("Passengers %d %c, %d %c, %d no route"), halt->get_pax_happy(), 30, halt->get_pax_unhappy(), 31, halt->get_pax_no_route()); + } + lb_happy[0].update(); } - lb_happy.update(); img_enable[0].set_visible(halt->get_pax_enabled()); img_enable[1].set_visible(halt->get_mail_enabled()); Index: gui/halt_info.h =================================================================== --- gui/halt_info.h (revision 9155) +++ gui/halt_info.h (working copy) @@ -51,7 +51,7 @@ private: gui_aligned_container_t *container_top; - gui_label_buf_t lb_capacity[3], lb_happy; + gui_label_buf_t lb_capacity[3], lb_happy[3]; gui_colorbox_t indicator_color; gui_image_t img_enable[3]; gui_halt_type_images_t *img_types; Index: simskin.cc =================================================================== --- simskin.cc (revision 9155) +++ simskin.cc (working copy) @@ -57,6 +57,9 @@ const skin_desc_t* skinverwaltung_t::passengers = NULL; const skin_desc_t* skinverwaltung_t::mail = NULL; const skin_desc_t* skinverwaltung_t::goods = NULL; +const skin_desc_t* skinverwaltung_t::happy = NULL; +const skin_desc_t* skinverwaltung_t::unhappy = NULL; +const skin_desc_t* skinverwaltung_t::no_route = NULL; const skin_desc_t* skinverwaltung_t::station_type = NULL; const skin_desc_t* skinverwaltung_t::seasons_icons = NULL; const skin_desc_t* skinverwaltung_t::message_options = NULL; @@ -123,6 +126,9 @@ { &skinverwaltung_t::passengers, "Passagiere" }, { &skinverwaltung_t::mail, "Post" }, { &skinverwaltung_t::goods, "Waren" }, + { &skinverwaltung_t::happy, "Happy" }, + { &skinverwaltung_t::unhappy, "Unhappy" }, + { &skinverwaltung_t::no_route, "NoRoute" }, { NULL, NULL } }; Index: simskin.h =================================================================== --- simskin.h (revision 9155) +++ simskin.h (working copy) @@ -110,6 +110,13 @@ static const skin_desc_t *goods; /// @} + /// @name icons used to passenger evaluations happy / unhappy / no route + /// @{ + static const skin_desc_t *happy; + static const skin_desc_t *unhappy; + static const skin_desc_t *no_route; + /// @} + /// images shown in display of lines in mini-map static const skin_desc_t *station_type;