From 7b15b5143633b0e204556c295d986c41b230e0cc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 Jan 2022 02:41:04 +0200 Subject: [PATCH 30/30] Draw integrating cardinal roads (rivers) correctly Reported by ddeanbrown See osdn #43153 Signed-off-by: Marko Lindqvist --- client/tilespec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/tilespec.c b/client/tilespec.c index 8107fdd075..e4941b34ab 100644 --- a/client/tilespec.c +++ b/client/tilespec.c @@ -5663,9 +5663,14 @@ int fill_sprite_array(struct tileset *t, for (i = 0; i < t->num_cardinal_tileset_dirs; i++) { enum direction8 cdir = t->cardinal_tileset_dirs[i]; - if (terrain_type_terrain_class(tterrain_near[cdir]) == TC_OCEAN - || BV_ISSET(textras_near[cdir], idx)) { + if (terrain_type_terrain_class(tterrain_near[cdir]) == TC_OCEAN) { tileno |= 1 << i; + } else { + extra_type_list_iterate(extra_road_get(priver)->integrators, iextra) { + if (BV_ISSET(textras_near[cdir], extra_index(iextra))) { + tileno |= 1 << i; + } + } extra_type_list_iterate_end; } } -- 2.34.1