Author: cazfi
Date: Sun Mar 22 10:42:36 2015
New Revision: 28600

URL: http://svn.gna.org/viewcvs/freeciv?rev=28600&view=rev
Log:
Draw city grids even if in addition to map grids.

Requested by Jacob Nevins

See bug #23302

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=28600&r1=28599&r2=28600&view=diff
==============================================================================
--- branches/S2_5/client/tilespec.c     (original)
+++ branches/S2_5/client/tilespec.c     Sun Mar 22 10:42:36 2015
@@ -4602,20 +4602,23 @@
               && (is_ocean_tile(pedge->tile[0])
                   ^ is_ocean_tile(pedge->tile[1]))) {
       ADD_SPRITE_SIMPLE(t->sprites.grid.coastline[pedge->type]);
-    } else if (draw_map_grid) {
-      if (worked[0] || worked[1]) {
-       ADD_SPRITE_SIMPLE(t->sprites.grid.worked[pedge->type]);
-      } else if (city[0] || city[1]) {
-       ADD_SPRITE_SIMPLE(t->sprites.grid.city[pedge->type]);
-      } else if (known[0] || known[1]) {
-       ADD_SPRITE_SIMPLE(t->sprites.grid.main[pedge->type]);
-      }
-    } else if (draw_city_outlines) {
-      if (XOR(city[0], city[1])) {
-       ADD_SPRITE_SIMPLE(t->sprites.grid.city[pedge->type]);
-      }
-      if (XOR(unit[0], unit[1])) {
-       ADD_SPRITE_SIMPLE(t->sprites.grid.worked[pedge->type]);
+    } else {
+      if (draw_map_grid) {
+        if (worked[0] || worked[1]) {
+          ADD_SPRITE_SIMPLE(t->sprites.grid.worked[pedge->type]);
+        } else if (city[0] || city[1]) {
+          ADD_SPRITE_SIMPLE(t->sprites.grid.city[pedge->type]);
+        } else if (known[0] || known[1]) {
+          ADD_SPRITE_SIMPLE(t->sprites.grid.main[pedge->type]);
+        }
+      }
+      if (draw_city_outlines) {
+        if (XOR(city[0], city[1])) {
+          ADD_SPRITE_SIMPLE(t->sprites.grid.city[pedge->type]);
+        }
+        if (XOR(unit[0], unit[1])) {
+          ADD_SPRITE_SIMPLE(t->sprites.grid.worked[pedge->type]);
+        }
       }
     }
 


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

Reply via email to