Author: cazfi
Date: Thu Feb 11 19:49:21 2016
New Revision: 31879
URL: http://svn.gna.org/viewcvs/freeciv?rev=31879&view=rev
Log:
Fixed unused entry warnings seen in supplied tilesets in S2_5.
See bug #24219
Modified:
branches/S2_6/client/tilespec.c
branches/S2_6/data/hex2t.tilespec
branches/S2_6/data/isophex.tilespec
branches/S2_6/data/trident/fog.spec
Modified: branches/S2_6/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=31879&r1=31878&r2=31879&view=diff
==============================================================================
--- branches/S2_6/client/tilespec.c (original)
+++ branches/S2_6/client/tilespec.c Thu Feb 11 19:49:21 2016
@@ -1480,8 +1480,11 @@
tileset_error(LOG_FATAL, _("Specfile %s has incompatible capabilities"),
sf->file_name);
}
- /* currently unused */
+ /* Currently unused */
(void) secfile_entry_lookup(file, "info.artists");
+
+ /* Not used here */
+ (void) secfile_entry_lookup(file, "file.gfx");
if ((sections = secfile_sections_by_name_prefix(file, "grid_"))) {
section_list_iterate(sections, psection) {
Modified: branches/S2_6/data/hex2t.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/hex2t.tilespec?rev=31879&r1=31878&r2=31879&view=diff
==============================================================================
--- branches/S2_6/data/hex2t.tilespec (original)
+++ branches/S2_6/data/hex2t.tilespec Thu Feb 11 19:49:21 2016
@@ -76,12 +76,6 @@
; space for the overall icon produced. Defaults to unit_upkeep_offset_y -
; not having alternative layout.
;unit_upkeep_small_offset_y = 0
-
-; Font to use to draw city names:
-city_names_font = "6x13bold"
-
-; Font to use to draw city productions:
-city_productions_font = "6x13"
; Font size (points) to use to draw city names and productions:
city_names_font_size = 10
Modified: branches/S2_6/data/isophex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/isophex.tilespec?rev=31879&r1=31878&r2=31879&view=diff
==============================================================================
--- branches/S2_6/data/isophex.tilespec (original)
+++ branches/S2_6/data/isophex.tilespec Thu Feb 11 19:49:21 2016
@@ -76,12 +76,6 @@
; space for the overall icon produced. Defaults to unit_upkeep_offset_y -
; not having alternative layout.
;unit_upkeep_small_offset_y = 0
-
-; Font to use to draw city names:
-city_names_font = "9x15bold"
-
-; Font to use to draw city productions:
-city_productions_font = "6x13"
; Font size (points) to use to draw city names and productions:
city_names_font_size = 10
Modified: branches/S2_6/data/trident/fog.spec
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/trident/fog.spec?rev=31879&r1=31878&r2=31879&view=diff
==============================================================================
--- branches/S2_6/data/trident/fog.spec (original)
+++ branches/S2_6/data/trident/fog.spec Thu Feb 11 19:49:21 2016
@@ -1,7 +1,9 @@
[spec]
+; Format and options of this spec file:
options = "+Freeciv-spec-Devel-2015-Mar-25"
+[info]
artists = "unknown"
[file]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
