Author: cazfi
Date: Thu Apr  2 21:17:08 2015
New Revision: 28692

URL: http://svn.gna.org/viewcvs/freeciv?rev=28692&view=rev
Log:
Added unit activity icon offset in Y-direction to tilespec format.

Requested by GriffonSpade

See patch #5961

Modified:
    trunk/client/tilespec.c
    trunk/data/amplio.tilespec
    trunk/data/amplio2.tilespec
    trunk/data/cimpletoon.tilespec
    trunk/data/hex2t.tilespec
    trunk/data/hexemplio.tilespec
    trunk/data/isophex.tilespec
    trunk/data/isotrident.tilespec
    trunk/data/toonhex.tilespec
    trunk/data/trident.tilespec

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Thu Apr  2 21:17:08 2015
@@ -481,6 +481,7 @@
   int citybar_offset_y;
   int tilelabel_offset_y;
   int activity_offset_x;
+  int activity_offset_y;
 
 #define NUM_CORNER_DIRS 4
 #define TILES_PER_CORNER 4
@@ -1705,6 +1706,8 @@
                              "tilespec.unit_offset_y")
       || !secfile_lookup_int(file, &t->activity_offset_x,
                              "tilespec.activity_offset_x")
+      || !secfile_lookup_int(file, &t->activity_offset_y,
+                             "tilespec.activity_offset_y")
       || !secfile_lookup_int(file, &t->city_offset_x,
                              "tilespec.city_offset_x")
       || !secfile_lookup_int(file, &t->city_offset_y,
@@ -3800,7 +3803,8 @@
     }
 
     if (s != NULL) {
-      ADD_SPRITE(s, TRUE, FULL_TILE_X_OFFSET + t->activity_offset_x, 
FULL_TILE_Y_OFFSET);
+      ADD_SPRITE(s, TRUE, FULL_TILE_X_OFFSET + t->activity_offset_x,
+                 FULL_TILE_Y_OFFSET + t->activity_offset_y);
     }
   }
 

Modified: trunk/data/amplio.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/amplio.tilespec  (original)
+++ trunk/data/amplio.tilespec  Thu Apr  2 21:17:08 2015
@@ -39,6 +39,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/amplio2.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/amplio2.tilespec (original)
+++ trunk/data/amplio2.tilespec Thu Apr  2 21:17:08 2015
@@ -39,6 +39,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/cimpletoon.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/cimpletoon.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/cimpletoon.tilespec      (original)
+++ trunk/data/cimpletoon.tilespec      Thu Apr  2 21:17:08 2015
@@ -39,6 +39,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/hex2t.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/hex2t.tilespec   (original)
+++ trunk/data/hex2t.tilespec   Thu Apr  2 21:17:08 2015
@@ -42,6 +42,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/hexemplio.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/hexemplio.tilespec       (original)
+++ trunk/data/hexemplio.tilespec       Thu Apr  2 21:17:08 2015
@@ -45,6 +45,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/isophex.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/isophex.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/isophex.tilespec (original)
+++ trunk/data/isophex.tilespec Thu Apr  2 21:17:08 2015
@@ -42,6 +42,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/isotrident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/isotrident.tilespec      (original)
+++ trunk/data/isotrident.tilespec      Thu Apr  2 21:17:08 2015
@@ -41,6 +41,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/toonhex.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/toonhex.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/toonhex.tilespec (original)
+++ trunk/data/toonhex.tilespec Thu Apr  2 21:17:08 2015
@@ -46,6 +46,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0

Modified: trunk/data/trident.tilespec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/trident.tilespec?rev=28692&r1=28691&r2=28692&view=diff
==============================================================================
--- trunk/data/trident.tilespec (original)
+++ trunk/data/trident.tilespec Thu Apr  2 21:17:08 2015
@@ -41,6 +41,7 @@
 
 ; offset of the normal activity icons
 activity_offset_x = 0
+activity_offset_y = 0
 
 ; offset the cities by this amount
 city_offset_x = 0


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

Reply via email to