buildings: draw top tile for ferry

render error happens, because top height was less than threshold

Author: dalerank

src/building/building.h

@@ -508,6 +508,7 @@ class building_impl {
     virtual bool draw_ornaments_and_animations_flat(painter &ctx, vec2i point, tile2i tile, color mask) { return false; }
     virtual bool force_draw_flat_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) { return false; }
     virtual bool force_draw_height_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) { return false; }
+    virtual bool force_draw_top_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) { return false; }
     virtual e_overlay get_overlay() const { return OVERLAY_NONE; }
     virtual bool need_road_access() const { return true; }
     virtual bool can_play_animation() const;

src/building/building_barracks.cpp

@@ -260,6 +260,6 @@ void info_window_recruiter::window_info_background(object_info &c) {
     });
 }
 
-inline bool info_window_recruiter::check(object_info &c) {
+bool info_window_recruiter::check(object_info &c) {
     return c.building_get()->dcast_recruiter();
 }

src/building/building_ferry.cpp

@@ -2,57 +2,83 @@
 
 #include "city/labor.h"
 #include "grid/water.h"
+#include "grid/image.h"
 #include "grid/building.h"
 #include "grid/building_tiles.h"
 #include "grid/routing/routing.h"
 #include "graphics/elements/ui.h"
 
 #include "io/gamefiles/lang.h"
 
-#include "js/js_game.h"
-
 buildings::model_t<building_ferry> ferry_m;
-
-ANK_REGISTER_CONFIG_ITERATOR(config_load_building_ferry);
-void config_load_building_ferry() {
-    ferry_m.load();
-}
+info_window_ferry ferry_infow;
 
 void building_ferry::on_create(int orientation) {
     data.industry.orientation = orientation;
 }
 
 void building_ferry::on_place_update_tiles(int orientation, int variant) {
-    int img_id = ferry_m.anim["base"].first_img() + orientation;
-    map_water_add_building(id(), tile(), ferry_m.building_size, img_id);
-    map_building_tiles_add(id(), tile(), ferry_m.building_size, img_id, TERRAIN_BUILDING|TERRAIN_ROAD|TERRAIN_FERRY_ROUTE);
+    int img_id = ferry_m.anim[animkeys().base].first_img() + orientation;
+    map_water_add_building(id(), tile(), size(), img_id);
+    map_building_tiles_add(id(), tile(), size(), img_id, TERRAIN_BUILDING|TERRAIN_ROAD|TERRAIN_FERRY_ROUTE);
 }
 
-void building_ferry::window_info_background(object_info &c) {
-    c.help_id = 85;
-    window_building_play_sound(&c, "Wavs/gatehouse.wav");
-    outer_panel_draw(c.offset, c.bgsize.x, c.bgsize.y);
-    lang_text_draw_centered(e_text_ferry_landing, 0, c.offset.x, c.offset.y + 10, 16 * c.bgsize.x, FONT_LARGE_BLACK_ON_LIGHT);
-    building *ferry = building_get(c.building_id);
-    if (!map_routing_ferry_has_routes(ferry)) {
-        window_building_draw_description_at(c, 16 * c.bgsize.y - 158, e_text_ferry_landing, e_text_ferry_landing_no_routes);
-    } else if (!ferry->has_road_access) {
-        window_building_draw_description_at(c, 16 * c.bgsize.y - 158, e_text_ferry_landing, e_text_ferry_landing_no_roads);
-    } else if (ferry->num_workers <= 0) {
-        window_building_draw_description_at(c, 16 * c.bgsize.y - 158, e_text_ferry_landing, e_text_ferry_landing_no_workers);
+void building_ferry::update_map_orientation(int orientation) {
+    int image_offset = city_view_relative_orientation(data.industry.orientation);
+    int image_id = ferry_m.anim[animkeys().base].first_img() + image_offset;
+    map_water_add_building(id(), tile(), size(), image_id);
+}
+
+bool building_ferry::force_draw_height_tile(painter &ctx, tile2i t, vec2i pixel, color mask) {
+    if (this->main()->tile() == t) {
+        int image_id = map_image_at(t);
+        ImageDraw::isometric_from_drawtile_top(ctx, image_id, pixel + vec2i{-30, 15}, mask);
+
+        return true;
     }
+
+    return false;
 }
 
-void building_ferry::update_map_orientation(int orientation) {
-    int image_offset = city_view_relative_orientation(data.industry.orientation);
-    int image_id = ferry_m.anim["base"].first_img() + image_offset;
-    map_water_add_building(id(), tile(), ferry_m.building_size, image_id);
+bool building_ferry::force_draw_top_tile(painter &ctx, tile2i t, vec2i pixel, color mask) {
+    if (this->main()->tile() == t) {
+        return true;
+    }
+
+    return false;
 }
 
+
 void building_ferry::highlight_waypoints() {
     building_impl::highlight_waypoints();
 
     ferry_tiles fpoints = map_water_docking_points(base);
     map_highlight_set(fpoints.point_a, 3);
     map_highlight_set(fpoints.point_b, 3);
 }
+
+
+bool info_window_ferry::check(object_info &c) {
+    return c.building_get()->dcast_ferry();
+}
+
+void info_window_ferry::init(object_info &c) {
+    building_info_window::init(c);
+
+    building *ferry = c.building_get();
+
+    textid reason{ 0, 0 };
+    if (!map_routing_ferry_has_routes(ferry)) {
+        reason = { c.group_id, 1 };
+    } else if (!ferry->has_road_access) {
+        reason = { c.group_id, 2 };
+    } else if (ferry->num_workers <= 0) {
+        reason = { c.group_id, 3 };
+    }
+
+    fill_employment_details(c);
+
+    if (reason.id) {
+        ui["warning_text"] = reason;
+    }
+}

src/building/building_ferry.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "building/building.h"
+#include "window/window_building_info.h"
 
 class building_ferry : public building_impl {
 public:
@@ -11,7 +12,13 @@ class building_ferry : public building_impl {
 
     virtual void on_create(int orientation) override;
     virtual void on_place_update_tiles(int orientation, int variant) override;
-    virtual void window_info_background(object_info &c) override;
     virtual void update_map_orientation(int orientation) override;
+    virtual bool force_draw_height_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
+    virtual bool force_draw_top_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
     virtual void highlight_waypoints() override;
+};
+
+struct info_window_ferry : public building_info_window_t<info_window_ferry> {
+    virtual void init(object_info &c) override;
+    virtual bool check(object_info &c) override;
 };

src/scripts/common.js

@@ -223,6 +223,7 @@ var sidebar_window_extra = {}
 var info_window_booth = {}
 var dock_info_window = {}
 var dock_orders_window = {}
+var info_window_ferry = {}
 
 //figures
 var figure_fireman = {}

src/widget/city/tile_draw.cpp

@@ -206,12 +206,13 @@ void draw_isometric_flat(vec2i pixel, tile2i tile, painter &ctx) {
     if (deletion_tool || map_property_is_deleted(tile)) {
         color_mask = COLOR_MASK_RED;
     }
-
+    
+    bool force_tile_draw = false;
     if (!map_property_is_draw_tile(grid_offset)) {
         bool force_tile_draw = false;
         if (building_id > 0) {
-            building *b = building_get(building_id);
-            force_tile_draw = b->dcast()->force_draw_flat_tile(ctx, tile, pixel, color_mask);
+            building_impl *b = building_get(building_id)->dcast();
+            force_tile_draw = b->force_draw_flat_tile(ctx, tile, pixel, color_mask);
         }
 
         if (!force_tile_draw) {
@@ -266,7 +267,7 @@ void draw_isometric_flat(vec2i pixel, tile2i tile, painter &ctx) {
     }
 
     int top_height = img->isometric_top_height();
-    map_render_set(grid_offset, top_height > 0 ? RENDER_TALL_TILE : 0);
+    map_render_set(grid_offset, (top_height > 0) ? RENDER_TALL_TILE : 0);
 }
 
 void draw_isometric_terrain_height(vec2i pixel, tile2i tile, painter &ctx) {
@@ -334,6 +335,7 @@ void draw_isometric_nonterrain_height(vec2i pixel, tile2i tile, painter &ctx) {
         bool force_draw_tile = false;
         if (building_id > 0) {
             force_draw_tile = b->dcast()->force_draw_height_tile(ctx, tile, pixel, color_mask);
+            b->dcast()->force_draw_top_tile(ctx, tile, pixel, color_mask);
         }
 
         if (!force_draw_tile) {

src/window/window_festival_square_info.cpp

@@ -17,11 +17,6 @@ struct festival_square_info_window : building_info_window {
 
 festival_square_info_window festival_square_infow;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_festival_square_info_window);
-void config_load_festival_square_info_window() {
-    festival_square_infow.load("festival_square_info_window");
-}
-
 void festival_square_info_window::window_info_background(object_info &c) {
     building_info_window::window_info_background(c);