Author: cazfi
Date: Thu Apr 2 21:17:15 2015
New Revision: 28693
URL: http://svn.gna.org/viewcvs/freeciv?rev=28693&view=rev
Log:
Added unit activity icon offset in Y-direction to tilespec format.
Requested by GriffonSpade
See patch #5961
Modified:
branches/S2_6/client/tilespec.c
branches/S2_6/data/amplio.tilespec
branches/S2_6/data/amplio2.tilespec
branches/S2_6/data/cimpletoon.tilespec
branches/S2_6/data/hex2t.tilespec
branches/S2_6/data/hexemplio.tilespec
branches/S2_6/data/isophex.tilespec
branches/S2_6/data/isotrident.tilespec
branches/S2_6/data/toonhex.tilespec
branches/S2_6/data/trident.tilespec
Modified: branches/S2_6/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/client/tilespec.c (original)
+++ branches/S2_6/client/tilespec.c Thu Apr 2 21:17:15 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,
@@ -3796,7 +3799,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: branches/S2_6/data/amplio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/amplio.tilespec (original)
+++ branches/S2_6/data/amplio.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/amplio2.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/amplio2.tilespec (original)
+++ branches/S2_6/data/amplio2.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/cimpletoon.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/cimpletoon.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/cimpletoon.tilespec (original)
+++ branches/S2_6/data/cimpletoon.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/hex2t.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hex2t.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/hex2t.tilespec (original)
+++ branches/S2_6/data/hex2t.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/hexemplio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hexemplio.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/hexemplio.tilespec (original)
+++ branches/S2_6/data/hexemplio.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/isophex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/isophex.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/isophex.tilespec (original)
+++ branches/S2_6/data/isophex.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/isotrident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/isotrident.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/isotrident.tilespec (original)
+++ branches/S2_6/data/isotrident.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/toonhex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/toonhex.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/toonhex.tilespec (original)
+++ branches/S2_6/data/toonhex.tilespec Thu Apr 2 21:17:15 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: branches/S2_6/data/trident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/trident.tilespec?rev=28693&r1=28692&r2=28693&view=diff
==============================================================================
--- branches/S2_6/data/trident.tilespec (original)
+++ branches/S2_6/data/trident.tilespec Thu Apr 2 21:17:15 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
