Author: cazfi
Date: Sat Mar 28 22:42:32 2015
New Revision: 28644

URL: http://svn.gna.org/viewcvs/freeciv?rev=28644&view=rev
Log:
Draw front part of bases located on unowned territory.

Reported by David Fernandez <bardo>

See bug #23418

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=28644&r1=28643&r2=28644&view=diff
==============================================================================
--- branches/S2_5/client/tilespec.c     (original)
+++ branches/S2_5/client/tilespec.c     Sat Mar 28 22:42:32 2015
@@ -5032,25 +5032,23 @@
         bool show_flag = FALSE;
         struct player *owner = base_owner(ptile);
 
-        if (owner != NULL) {
-          base_type_iterate(pbase) {
-            if (tile_has_base(ptile, pbase)) {
-              if (t->sprites.bases[base_index(pbase)].foreground) {
-                /* Draw fortress front in iso-view (non-iso view only has a 
fortress
-                 * back). */
-                
ADD_SPRITE_FULL(t->sprites.bases[base_index(pbase)].foreground);
-              }
-              if (base_has_flag(pbase, BF_SHOW_FLAG)) {
-                show_flag = TRUE;
-              }
+        base_type_iterate(pbase) {
+          if (tile_has_base(ptile, pbase)) {
+            if (t->sprites.bases[base_index(pbase)].foreground) {
+              /* Draw fortress front in iso-view (non-iso view only has a 
fortress
+               * back). */
+              ADD_SPRITE_FULL(t->sprites.bases[base_index(pbase)].foreground);
             }
-          } base_type_iterate_end;
-
-          if (show_flag && owner != NULL) {
-            ADD_SPRITE(get_nation_flag_sprite(t, nation_of_player(owner)), 
TRUE,
-                       FULL_TILE_X_OFFSET + t->city_flag_offset_x,
-                       FULL_TILE_Y_OFFSET + t->city_flag_offset_y);
+            if (base_has_flag(pbase, BF_SHOW_FLAG)) {
+              show_flag = TRUE;
+            }
           }
+        } base_type_iterate_end;
+
+        if (show_flag && owner != NULL) {
+          ADD_SPRITE(get_nation_flag_sprite(t, nation_of_player(owner)), TRUE,
+                     FULL_TILE_X_OFFSET + t->city_flag_offset_x,
+                     FULL_TILE_Y_OFFSET + t->city_flag_offset_y);
         }
       }
     }


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

Reply via email to