Index: server/cityhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityhand.c,v
retrieving revision 1.85
diff -u -r1.85 cityhand.c
--- cityhand.c	2000/08/17 03:20:23	1.85
+++ cityhand.c	2000/08/18 05:51:43
@@ -106,8 +106,9 @@
   int i, j;
   static int n_misc = -1;
   static char tempname[MAX_LEN_NAME];
-  static const int max_nb_name = MAP_MAX_WIDTH * MAP_MAX_WIDTH; 
 
+  static const int num_tiles = MAP_MAX_WIDTH * MAP_MAX_HEIGHT; 
+
   freelog(LOG_VERBOSE, "Suggesting city name for %s", pplayer->name);
   
   for(nptr=get_nation_by_plr(pplayer)->default_city_names; *nptr; nptr++) {
@@ -130,7 +131,7 @@
     }
   }
 
-  for (i = 1; i < max_nb_name; i++ ) {
+  for (i = 1; i <= num_tiles; i++ ) {
     my_snprintf(tempname, MAX_LEN_NAME, _("City no. %d"), i);
     if (!game_find_city_by_name(tempname)) 
       return tempname;