[Freeciv-Dev] (PR#2360) tileset bug in recent CVS

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

I broke CVS.  civclient's -t option currently doesn't work.

Here is a fix.

jason

? client/gui-gtk/diff
? client/gui-gtk-2.0/stE56rrs
? client/gui-stub/stub-update.diff
? client/gui-xaw/diff
Index: client//civclient.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/civclient.c,v
retrieving revision 1.153
diff -u -r1.153 civclient.c
--- client//civclient.c 2002/11/16 02:12:38     1.153
+++ client//civclient.c 2002/11/19 07:33:53
@@ -78,7 +78,7 @@
    needed (hence, it is not 'extern'd in civclient.h) */
 bool is_server = FALSE;
 
-char tile_set_name[512] = "\0";
+static char tile_set_name[512] = "\0";
 char sound_plugin_name[512] = "\0";
 char sound_set_name[512] = "\0";
 char server_host[512] = "\0";
Index: client//civclient.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/civclient.h,v
retrieving revision 1.22
diff -u -r1.22 civclient.h
--- client//civclient.h 2002/09/28 01:36:19     1.22
+++ client//civclient.h 2002/11/19 07:33:53
@@ -39,7 +39,6 @@
 
 void client_remove_cli_conn(struct connection *pconn);
 
-extern char tile_set_name[512];
 extern char sound_plugin_name[512];
 extern char sound_set_name[512];
 extern char server_host[512];
Index: client//options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.71
diff -u -r1.71 options.c
--- client//options.c   2002/11/17 02:21:11     1.71
+++ client//options.c   2002/11/19 07:33:53
@@ -93,7 +93,7 @@
                 NULL, NULL),
   GEN_STR_OPTION(default_tile_set_name,     N_("Default tileset"),
                 get_tileset_list, NULL),
-  GEN_STR_OPTION(tile_set_name, N_("Current tileset (EXPERIMENTAL)"),
+  GEN_STR_OPTION(current_tile_set_name, N_("Current tileset (EXPERIMENTAL)"),
                  get_tileset_list, tilespec_reread_callback),
   GEN_STR_OPTION(default_sound_set_name,    N_("Default name of sound set"),
                 get_soundset_list, NULL),
Index: client//tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.89
diff -u -r1.89 tilespec.c
--- client//tilespec.c  2002/11/17 02:21:11     1.89
+++ client//tilespec.c  2002/11/19 07:33:54
@@ -56,6 +56,7 @@
 char *minimap_intro_filename;
 
 struct named_sprites sprites;
+char current_tile_set_name[512];
 
 const int DIR4_TO_DIR8[4] = {DIR8_NORTH, DIR8_SOUTH, DIR8_EAST, DIR8_WEST};
 
@@ -439,6 +440,8 @@
   section_file_free(file);
   freelog(LOG_VERBOSE, "finished reading %s", fname);
   free(fname);
+
+  sz_strlcpy(current_tile_set_name, tileset_name);
 }
 
 /**********************************************************************
Index: client//tilespec.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v
retrieving revision 1.31
diff -u -r1.31 tilespec.h
--- client//tilespec.h  2002/11/17 02:21:11     1.31
+++ client//tilespec.h  2002/11/19 07:33:54
@@ -192,6 +192,8 @@
 
 extern struct named_sprites sprites;
 
+extern char current_tile_set_name[512];
+
 /* full pathnames: */
 extern char *main_intro_filename;
 extern char *minimap_intro_filename;