Author: cazfi
Date: Mon Nov 16 21:46:49 2015
New Revision: 30643

URL: http://svn.gna.org/viewcvs/freeciv?rev=30643&view=rev
Log:
Make sure that unit itself gets drawn completely even if its bottom is below
upkeep icon layer's bottom.

See bug #24051

Modified:
    branches/S2_5/client/tilespec.c

Modified: branches/S2_5/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/tilespec.c?rev=30643&r1=30642&r2=30643&view=diff
==============================================================================
--- branches/S2_5/client/tilespec.c     (original)
+++ branches/S2_5/client/tilespec.c     Mon Nov 16 21:46:49 2015
@@ -790,7 +790,10 @@
 ****************************************************************************/
 int tileset_unit_with_upkeep_height(const struct tileset *t)
 {
-  return tileset_unit_layout_offset_y(tileset) + 
tileset_upkeep_height(tileset);
+  int uk_bottom = tileset_unit_layout_offset_y(tileset) + 
tileset_upkeep_height(tileset);
+  int u_bottom = tileset_unit_height(tileset);
+
+  return MAX(uk_bottom, u_bottom);
 }
 
 /****************************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to