ui: show home type for cart pusher

Author: dalerank

src/scripts/common.js

@@ -112,7 +112,6 @@ var advisor_trade_window = {}
 var advisor_imperial_window = {}
 var info_window_figure_enemy = {}
 var info_window_figure_animal = {}
-var info_window_figure_caravan_donkey = {}
 var roadblock_info_window = {}
 var hold_festival_window = {}
 var empty_info_window = {}

src/scripts/ui.js

@@ -1007,16 +1007,17 @@ window figure_warship_info_window = {
 	}
 }
 
-info_window_figure_caravan_donkey = {
+window info_window_figure_caravan_donkey = {
 	ui : __baseui(figure_info_window, {
-   	bought_items   : { type : "text", pos: [40, 180], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
-   	sold_items     : { type : "text", pos: [40, 210], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true },
+   	bought_items   : text({pos: [40, 180], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true }),
+   	sold_items     : text({pos: [40, 210], size:[px(29), px(10)], wrap:px(29), font : FONT_NORMAL_WHITE_ON_DARK, font_link:FONT_NORMAL_YELLOW, rich:true, clip_area:true }),
 	})
 }
 
 window figure_carrier_info_window = {
 	ui : __baseui(figure_info_window, {
-		items					 : text({pos: [102, 158], size:[px(29), 20], font : FONT_NORMAL_BLACK_ON_DARK, rich:true }),
+		typename			 : text({pos: [92, 139], text:"${figure.class_name} ( @Y${figure.home}& )", font : FONT_NORMAL_BLACK_ON_DARK, rich:true, scroll:false }),
+		items					 : text({pos: [102, 158], size:[px(29), 20], font : FONT_NORMAL_BLACK_ON_DARK, rich:true, scroll:false }),
 		phrase				 : text({pos: [90, 180], font : FONT_NORMAL_BLACK_ON_DARK, wrap:px(22), multiline:true }),
 	})
 }

src/window/window_figure_carrier_info.cpp

@@ -21,12 +21,6 @@ void figure_carrier_info_window::init(object_info &c) {
 
     figure_cartpusher *f = c.figure_get<figure_cartpusher>();
 
-    bstring256 home_text;
-    if (f->base.has_home()) {
-        home_text = ui::str(41, f->home()->type);
-    }
-    ui["type"].text_var("%s %s", home_text.c_str(), ui::str(64, f->type()));
-
     if (f->action_state() != FIGURE_ACTION_132_DOCKER_IDLING && f->base.resource_id) {
         int resource_img = image_id_resource_icon(f->base.resource_id);
         ui["items"].text_var("@I%u& %u %s %s", resource_img, f->base.resource_amount_full, ui::str(129, 20), ui::str(23, f->base.resource_id));