Author: cazfi
Date: Sat Aug 8 17:31:59 2015
New Revision: 29399
URL: http://svn.gna.org/viewcvs/freeciv?rev=29399&view=rev
Log:
Removed radar graphics.
See patch #6188
Removed:
trunk/data/misc/radar.png
Modified:
trunk/client/tilespec.c
trunk/client/tilespec.h
trunk/data/alio.tilespec
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/misc/Makefile.am
trunk/data/toonhex.tilespec
trunk/data/trident.tilespec
trunk/doc/README.graphics
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Sat Aug 8 17:31:59 2015
@@ -465,7 +465,6 @@
int small_sprite_width, small_sprite_height;
char *main_intro_filename;
- char *minimap_intro_filename;
int city_names_font_size, city_productions_font_size;
@@ -772,16 +771,6 @@
const char *tileset_main_intro_filename(const struct tileset *t)
{
return t->main_intro_filename;
-}
-
-/****************************************************************************
- Return the path within the data directories where the mini intro graphics
- file can be found. (It is left up to the GUI code to load and unload this
- file.)
-****************************************************************************/
-const char *tileset_mini_intro_filename(const struct tileset *t)
-{
- return t->minimap_intro_filename;
}
/****************************************************************************
@@ -976,10 +965,6 @@
if (t->main_intro_filename) {
free(t->main_intro_filename);
t->main_intro_filename = NULL;
- }
- if (t->minimap_intro_filename) {
- free(t->minimap_intro_filename);
- t->minimap_intro_filename = NULL;
}
if (t->prefered_themes) {
@@ -1736,14 +1721,6 @@
c = secfile_lookup_str(file, "tilespec.main_intro_file");
t->main_intro_filename = tilespec_gfx_filename(c);
log_debug("intro file %s", t->main_intro_filename);
-
- c = secfile_lookup_str_default(file, NULL, "tilespec.minimap_intro_file");
- if (c == NULL) {
- t->minimap_intro_filename = NULL;
- } else {
- t->minimap_intro_filename = tilespec_gfx_filename(c);
- log_debug("radar file %s", t->minimap_intro_filename);
- }
/* Terrain layer info. */
for (i = 0; i < MAX_NUM_LAYERS; i++) {
Modified: trunk/client/tilespec.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.h?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/client/tilespec.h (original)
+++ trunk/client/tilespec.h Sat Aug 8 17:31:59 2015
@@ -386,7 +386,6 @@
int tileset_citybar_offset_y(const struct tileset *t);
int tileset_tilelabel_offset_y(const struct tileset *t);
const char *tileset_main_intro_filename(const struct tileset *t);
-const char *tileset_mini_intro_filename(const struct tileset *t);
int tileset_num_city_colors(const struct tileset *t);
void tileset_use_prefered_theme(const struct tileset *t);
bool tileset_use_hard_coded_fog(const struct tileset *t);
Modified: trunk/data/alio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alio.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/alio.tilespec (original)
+++ trunk/data/alio.tilespec Sat Aug 8 17:31:59 2015
@@ -78,7 +78,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/amplio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/amplio.tilespec (original)
+++ trunk/data/amplio.tilespec Sat Aug 8 17:31:59 2015
@@ -62,7 +62,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/amplio2.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/amplio2.tilespec (original)
+++ trunk/data/amplio2.tilespec Sat Aug 8 17:31:59 2015
@@ -62,7 +62,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/cimpletoon.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/cimpletoon.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/cimpletoon.tilespec (original)
+++ trunk/data/cimpletoon.tilespec Sat Aug 8 17:31:59 2015
@@ -62,7 +62,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/hex2t.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/hex2t.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/hex2t.tilespec (original)
+++ trunk/data/hex2t.tilespec Sat Aug 8 17:31:59 2015
@@ -74,7 +74,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/hexemplio.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/hexemplio.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/hexemplio.tilespec (original)
+++ trunk/data/hexemplio.tilespec Sat Aug 8 17:31:59 2015
@@ -77,7 +77,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/isophex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isophex.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/isophex.tilespec (original)
+++ trunk/data/isophex.tilespec Sat Aug 8 17:31:59 2015
@@ -74,7 +74,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/isotrident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/isotrident.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/isotrident.tilespec (original)
+++ trunk/data/isotrident.tilespec Sat Aug 8 17:31:59 2015
@@ -64,7 +64,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/misc/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/Makefile.am?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/misc/Makefile.am (original)
+++ trunk/data/misc/Makefile.am Sat Aug 8 17:31:59 2015
@@ -29,7 +29,6 @@
mpicon.png \
overlays.png \
overlays.spec \
- radar.png \
shields-large.spec \
shields.spec \
small.png \
Removed: trunk/data/misc/radar.png
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/radar.png?rev=29398&view=auto
==============================================================================
Binary file - no diff available.
Modified: trunk/data/toonhex.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/toonhex.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/toonhex.tilespec (original)
+++ trunk/data/toonhex.tilespec Sat Aug 8 17:31:59 2015
@@ -78,7 +78,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/data/trident.tilespec
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/trident.tilespec?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/trident.tilespec (original)
+++ trunk/data/trident.tilespec Sat Aug 8 17:31:59 2015
@@ -64,7 +64,6 @@
; These are special because they get freed and reloaded
; as required:
main_intro_file = "misc/intro"
-minimap_intro_file = "misc/radar"
; Below, the graphics spec files; must be somewhere (anywhere) in
; the data path. Order may be important for color allocation on
Modified: trunk/doc/README.graphics
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.graphics?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/doc/README.graphics (original)
+++ trunk/doc/README.graphics Sat Aug 8 17:31:59 2015
@@ -77,7 +77,6 @@
city_names_font : an X font string
city_productions_font : an X font string
main_intro_file : GFX file for the intro graphics
- minimap_intro_file : GFX file for the radar screen intro graphics
String vectors
--------------
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
