Complete.Org: Mailing Lists: Archives: freeciv-dev: November 2004:
[Freeciv-Dev] (PR#11129) Loaded 'L' Icon
Home

[Freeciv-Dev] (PR#11129) Loaded 'L' Icon

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: chrisk@xxxxxxxxx
Subject: [Freeciv-Dev] (PR#11129) Loaded 'L' Icon
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 22 Nov 2004 11:42:59 -0800
Reply-to: rt@xxxxxxxxxxx

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

> [chrisk - Sun Nov 21 14:50:41 2004]:
> 
> 
> CVS 21 NOV 2004 S2 GTK2
> 
> When a unit both has exhausted MP and is loaded on a ship, the 'L' (for
> Loaded) in the unit icon is overlayed with the 'exhausted MP' shield
symbol.
> 
> I think it should be just the other way round.

This patch moves the drawing code way up.  Is this better?

jason

Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.214
diff -u -r1.214 tilespec.c
--- client/tilespec.c   22 Nov 2004 19:14:41 -0000      1.214
+++ client/tilespec.c   22 Nov 2004 19:42:29 -0000
@@ -1973,6 +1973,10 @@
 
   ADD_SPRITE_FULL(unit_type(punit)->sprite);
 
+  if (sprites.unit.loaded && punit->transported_by != -1) {
+    ADD_SPRITE_FULL(sprites.unit.loaded);
+  }
+
   if(punit->activity!=ACTIVITY_IDLE) {
     struct Sprite *s = NULL;
     switch(punit->activity) {
@@ -2062,10 +2066,6 @@
     ADD_SPRITE_FULL(sprites.unit.stack);
   }
 
-  if (sprites.unit.loaded && punit->transported_by != -1) {
-    ADD_SPRITE_FULL(sprites.unit.loaded);
-  }
-
   if (sprites.unit.vet_lev[punit->veteran]) {
     ADD_SPRITE_FULL(sprites.unit.vet_lev[punit->veteran]);
   }

[Prev in Thread] Current Thread [Next in Thread]