Author: cazfi
Date: Sun Mar 8 02:46:05 2015
New Revision: 28462
URL: http://svn.gna.org/viewcvs/freeciv?rev=28462&view=rev
Log:
Draw city grids even if in addition to map grids.
Requested by Jacob Nevins <jtn>
See bug #23302
Modified:
branches/S2_6/client/tilespec.c
Modified: branches/S2_6/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=28462&r1=28461&r2=28462&view=diff
==============================================================================
--- branches/S2_6/client/tilespec.c (original)
+++ branches/S2_6/client/tilespec.c Sun Mar 8 02:46:05 2015
@@ -4683,20 +4683,23 @@
&& (is_ocean_tile(pedge->tile[0])
^ is_ocean_tile(pedge->tile[1]))) {
ADD_SPRITE_SIMPLE(t->sprites.grid.coastline[pedge->type]);
- } else if (options.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 (options.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 (options.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 (options.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
