Author: cazfi
Date: Mon Dec 29 03:38:50 2014
New Revision: 27432
URL: http://svn.gna.org/viewcvs/freeciv?rev=27432&view=rev
Log:
Adjust offsets from put_xxx() functions according to the zoom level.
See bug #23104
Modified:
trunk/client/mapview_common.c
Modified: trunk/client/mapview_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/mapview_common.c?rev=27432&r1=27431&r2=27432&view=diff
==============================================================================
--- trunk/client/mapview_common.c (original)
+++ trunk/client/mapview_common.c Mon Dec 29 03:38:50 2014
@@ -1007,7 +1007,7 @@
void put_unit(const struct unit *punit, struct canvas *pcanvas, float zoom,
int canvas_x, int canvas_y)
{
- canvas_y += (tileset_unit_height(tileset) - tileset_tile_height(tileset));
+ canvas_y += (tileset_unit_height(tileset) - tileset_tile_height(tileset)) *
zoom;
mapview_layer_iterate(layer) {
put_one_element(pcanvas, zoom, layer, NULL, NULL, NULL,
punit, NULL, canvas_x, canvas_y, NULL, NULL);
@@ -1021,7 +1021,7 @@
void put_unittype(const struct unit_type *putype, struct canvas *pcanvas,
float zoom,
int canvas_x, int canvas_y)
{
- canvas_y += (tileset_unit_height(tileset) - tileset_tile_height(tileset));
+ canvas_y += (tileset_unit_height(tileset) - tileset_tile_height(tileset)) *
zoom;
mapview_layer_iterate(layer) {
put_one_element(pcanvas, zoom, layer, NULL, NULL, NULL,
NULL, NULL, canvas_x, canvas_y, NULL, putype);
@@ -1036,7 +1036,7 @@
void put_city(struct city *pcity, struct canvas *pcanvas, float zoom,
int canvas_x, int canvas_y)
{
- canvas_y += (tileset_full_tile_height(tileset) -
tileset_tile_height(tileset));
+ canvas_y += (tileset_full_tile_height(tileset) -
tileset_tile_height(tileset)) * zoom;
mapview_layer_iterate(layer) {
put_one_element(pcanvas, zoom, layer,
NULL, NULL, NULL, NULL, pcity,
@@ -1054,7 +1054,7 @@
int canvas_x, int canvas_y)
{
/* Use full tile height, even for terrains. */
- canvas_y += (tileset_full_tile_height(tileset) -
tileset_tile_height(tileset));
+ canvas_y += (tileset_full_tile_height(tileset) -
tileset_tile_height(tileset)) * zoom;
mapview_layer_iterate(layer) {
put_one_element(pcanvas, zoom, layer, ptile, NULL, NULL, NULL, NULL,
canvas_x, canvas_y, NULL, NULL);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
