[Freeciv-Dev] (PR#4832) merge isotrident and trident flags

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

This patch moves the trident flags.png as-is into the misc directory, 
and sets up both trident and isotrident to use it.  (Apply the patch and 
put flags.spec and flags.png into data/misc.  Optionally you may remove 
trident/flags.*.)

Note, trident does have padding on its flag sprites; this patch doesn't 
remove that padding or the need for special-case code to handle flag 
graphics (in the player dialog, for instance).  But it does get rid of 
the need for a separate isotrident flags file.

This is an intermediate step in the long-term plan for flag graphics. 
But perhaps it's not a necessary one?  We'll see.

jason

? data/misc/flags.png
? data/misc/flags.spec
Index: data/isotrident.tilespec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/isotrident.tilespec,v
retrieving revision 1.8
diff -u -r1.8 isotrident.tilespec
--- data/isotrident.tilespec    2003/02/02 00:15:53     1.8
+++ data/isotrident.tilespec    2003/08/12 19:13:11
@@ -23,6 +23,10 @@
 
 ; Use roadstyle 0 (old iso style)
 roadstyle = 0
+ 
+; offset the flags by this amount when drawing units
+flag_offset_x = 17
+flag_offset_y = 11
 
 ; Font to use to draw city names:
 city_names_font = "9x15bold"
@@ -45,7 +49,7 @@
   "isotrident/tiles.spec",
   "isotrident/small.spec",
   "isotrident/units.spec",
-  "isotrident/flags.spec",
+  "misc/flags.spec",
   "misc/buildings.spec",
   "misc/space.spec",
 ;  "misc/techs.spec",
Index: data/trident.tilespec
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/trident.tilespec,v
retrieving revision 1.15
diff -u -r1.15 trident.tilespec
--- data/trident.tilespec       2003/02/02 00:15:53     1.15
+++ data/trident.tilespec       2003/08/12 19:13:11
@@ -23,6 +23,10 @@
 
 ; Use roadstyle 1 (old non-iso style)
 roadstyle = 1
+ 
+; offset the flags by this amount when drawing units
+flag_offset_x = 0
+flag_offset_y = 0
 
 ; Font to use to draw city names:
 city_names_font = "9x15bold"
@@ -43,7 +47,7 @@
   "trident/tiles.spec",
   "misc/small.spec",
   "trident/units.spec",
-  "trident/flags.spec",
+  "misc/flags.spec",
   "trident/roads.spec",
   "misc/buildings.spec",
   "misc/space.spec",

[spec]

; Format and options of this spec file:
options = "+spec2"

[info]

artists = "
    Tatu Rissanen <tatu.rissanen@xxxxxx>
    David Pfitzner <dwp@xxxxxxxxxxxxxx> (revised)
    Jerzy Klek <qpkjeek@xxxxxxxxxxxxxxx> (more flags added)
    Reineir Post <reinpost@xxxxxxxxxx> (Sweden, Holland)
    Vasco Costa <vasc@xxxxxxxxxxxxxx> (Portugal)
    Robert Brady <rwb197@xxxxxxxxxxxxxxx> (more flags)
    Tomasz Wegrzanowski <maniek@xxxxxxxx> (more flags added, Silesia)
    Paul Zastoupil <paulz@xxxxxxxx> (Dunedain, Mordor)
    Jan Heidefuss <jan_heidefuss@xxxxxxxx> (Bavarian)
    Ivan kosak <ivan.kosak@xxxxxxxxx> (Croatia,Slovenia,Serbia)
"

[file]
gfx = "misc/flags"

[grid_main]

x_top_left = 0
y_top_left = 0
dx = 30
dy = 30

tiles = { "row", "column", "tag"
  0,  0, "f.italy"
  0,  1, "f.iraq_old"
  0,  2, "f.germany"
  0,  3, "f.egypt"
  0,  4, "f.usa"
  0,  5, "f.greece"
  0,  6, "f.india"
  0,  7, "f.russia"
  0,  8, "f.rwanda"       ; for Zulu
  0,  9, "f.france"
  0, 10, "f.mexico"
  0, 11, "f.china"
  0, 12, "f.united_kingdom"
  0, 13, "f.mongolia"
  1,  0, "f.denmark"
  1,  1, "f.australia"
  1,  2, "f.brasil"
  1,  3, "f.soviet"
  1,  4, "f.japan"
  1,  5, "f.spain"
  1,  6, "f.finland"
  1,  7, "f.hungary"
  1,  8, "f.poland"
  1,  9, "f.iran"
  1, 10, "f.peru"
  1, 11, "f.turkey"
  1, 12, "f.tunisia"
  1, 13, "f.arab"         ; Saudi Arabia
  2,  0, "f.south_africa" ; Republic of South Africa, for Zulus
  2,  1, "f.sweden"
  2,  2, "f.netherlands", 
         "f.holland"      ; backward compatibility
  2,  3, "f.syria"
  2,  4, "f.macedonia"
  2,  5, "f.ukraine"
  2,  6, "f.cheyenne"
  2,  7, "f.norway"
  2,  8, "f.portugal"
  2,  9, "f.czech"
  2, 10, "f.england"
  2, 11, "f.scotland"
  2, 12, "f.unknown"      ; useful for alternates
  2, 13, "f.barbarian"
  3,  0, "f.europe"
  3,  1, "f.canada"
  3,  2, "f.korea"
  3,  3, "f.israel"
  3,  4, "f.ireland"
  3,  5, "f.belgium"
  3,  6, "f.iceland"
  3,  7, "f.pakistan"
  3,  8, "f.greenland"
  3,  9, "f.austria"
  3, 10, "f.argentina"
  3, 11, "f.united_nations"
  3, 12, "f.nato"
  3, 13, "f.vietnam"
  4,  0, "f.thailand"
  4,  1, "f.olympic"
  4,  2, "f.krev"
  4,  3, "f.wales"
  4,  4, "f.lithuania"
  4,  5, "f.kenya"
  4,  6, "f.dunedain"
  4,  7, "f.bulgaria"
  4,  8, "f.armenia"
  4,  9, "f.azerbaijan"
  4, 10, "f.boer"         ; old south african
  4, 11, "f.mordor"
  4, 12, "f.bavarian"
  4, 13, "f.rome"         ; Roman republic flag
  5,  0, "f.cornwall"
  5,  1, "f.philippines"
  5,  2, "f.estonia"
  5,  3, "f.latvia"
  5,  4, "f.silesia"
  5,  5, "f.singapore"
  5,  6, "f.chile"
  5,  7, "f.catalan"
  5,  8, "f.croatia"
  5,  9, "f.slovenia"
  5, 10, "f.serbia"
}