Project

General

Profile

Download (4.2 KB)

Bug #1666 » 0025-Fix-svg-flag-drawing-with-full-citybar-disabled.patch

Marko Lindqvist, 11/04/2025 11:16 PM

View differences:

client/mapview_common.c
continue;
}
if (fog && pdrawn[i].foggable) {
if (pdrawn[i].w > 0) {
/* TODO: Fog support */
canvas_put_flag_sprite(pcanvas,
canvas_x / zoom + pdrawn[i].offset_x,
canvas_y / zoom + pdrawn[i].offset_y,
pdrawn[i].w / zoom,
pdrawn[i].h / zoom,
pdrawn[i].sprite);
} else if (fog && pdrawn[i].foggable) {
canvas_put_sprite_fogged(pcanvas,
canvas_x / zoom + pdrawn[i].offset_x,
canvas_y / zoom + pdrawn[i].offset_y,
client/tilespec.c
#define FULL_TILE_X_OFFSET ((t->normal_tile_width - t->full_tile_width) / 2)
#define FULL_TILE_Y_OFFSET (t->normal_tile_height - t->full_tile_height)
#define ADD_SPRITE(s, draw_fog, x_offset, y_offset) \
#define ADD_SPRITE_SIZE(s, draw_fog, x_offset, y_offset, w_in, h_in) \
(fc_assert(s != NULL), \
sprs->sprite = s, \
sprs->foggable = (draw_fog && t->fogstyle == FOG_AUTO), \
sprs->offset_x = x_offset, \
sprs->offset_y = y_offset, \
sprs->w = w_in, \
sprs->h = h_in, \
sprs++)
#define ADD_SPRITE(s, draw_fog, x_offset, y_offset) \
ADD_SPRITE_SIZE(s, draw_fog, x_offset, y_offset, 0, 0)
#define ADD_SPRITE_SIMPLE(s) ADD_SPRITE(s, TRUE, 0, 0)
#define ADD_SPRITE_FULL(s) \
ADD_SPRITE(s, TRUE, FULL_TILE_X_OFFSET, FULL_TILE_Y_OFFSET)
......
/* City. Some city sprites are drawn later. */
if (pcity && gui_options.draw_cities) {
if (!gui_options.draw_full_citybar && !gui_options.solid_color_behind_units) {
ADD_SPRITE(get_city_flag_sprite(t, pcity), TRUE,
FULL_TILE_X_OFFSET + t->city_flag_offset_x,
FULL_TILE_Y_OFFSET + t->city_flag_offset_y);
struct sprite *spr = get_city_flag_sprite(t, pcity);
struct area_rect flag_rect;
get_flag_dimensions(spr, &flag_rect, tileset_svg_flag_height(tileset));
ADD_SPRITE_SIZE(spr, TRUE,
FULL_TILE_X_OFFSET + t->city_flag_offset_x,
FULL_TILE_Y_OFFSET + t->city_flag_offset_y,
flag_rect.w, flag_rect.h);
}
/* For iso-view the city.wall graphics include the full city, whereas
* for non-iso view they are an overlay on top of the base city
client/tilespec.h
bool foggable; /* Set to FALSE for sprites that are never fogged. */
struct sprite *sprite;
int offset_x, offset_y; /* Offset from tile origin */
int w, h;
};
/* Items on the mapview are drawn in layers. Each entry below represents
(5-5/5)