[Freeciv-Dev] Re: (PR#10515) "occupied" flag is behind city

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10515 >

Jason Short wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=10515 >
> 
> The "occupied" flag is behind the city sprite.  This makes it hard to 
> see it for large cities.  It should be in front.

See the attached screenshot, or load the attached savegame and use 
trident.  This problem is really only in the tropical citystyle that I 
can see.

This patch fixes it.  Things don't seem any worse in other citystyles.

jason

flag.sav.gz
Description: Unix tar archive

? newtiles
Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.204
diff -u -r1.204 tilespec.c
--- client/tilespec.c   4 Oct 2004 19:39:18 -0000       1.204
+++ client/tilespec.c   13 Oct 2004 22:02:46 -0000
@@ -2710,10 +2710,10 @@
       ADD_SPRITE(get_city_nation_flag_sprite(pcity),
                 DRAW_FULL, TRUE, flag_offset_x, flag_offset_y);
     }
+    ADD_SPRITE_FULL(get_city_sprite(pcity));
     if (pcity->client.occupied) {
       ADD_SPRITE_FULL(get_city_occupied_sprite(pcity));
     }
-    ADD_SPRITE_FULL(get_city_sprite(pcity));
     if (!is_isometric && city_got_citywalls(pcity)) {
       /* In iso-view the city wall is a part of the city sprite. */
       ADD_SPRITE_SIMPLE(get_city_wall_sprite(pcity));