diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/map.c freeciv/common/map.c
--- FreecivCVS/common/map.c	Mon Jul 17 10:13:01 2000
+++ freeciv/common/map.c	Fri Jul 21 09:30:27 2000
@@ -567,19 +567,6 @@
 /***************************************************************
 ...
 ***************************************************************/
-int is_special_type_close(int x, int y, enum tile_special_type spe)
-{
-  int x1,y1;
-  for (x1=x-1;x1<x+2;x1++)
-    for (y1=y-1;y1<=y+2;y1++) 
-      if((map_get_tile(x1,y1)->special)&spe)
-	return 1;
-  return 0;
-}
-
-/***************************************************************
-...
-***************************************************************/
 int is_sea_usable(int x, int y)
 {
   int x1,y1;
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/map.h freeciv/common/map.h
--- FreecivCVS/common/map.h	Mon Jul 17 10:13:01 2000
+++ freeciv/common/map.h	Fri Jul 21 09:30:27 2000
@@ -215,7 +215,6 @@
 int is_starter_close(int x, int y, int nr, int dist); 
 int is_good_tile(int x, int y);
 int is_special_close(int x, int y);
-int is_special_type_close(int x, int y, enum tile_special_type spe);
 int is_sea_usable(int x, int y);
 int get_tile_food_base(struct tile * ptile);
 int get_tile_shield_base(struct tile * ptile);
diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/mapgen.c freeciv/server/mapgen.c
--- FreecivCVS/server/mapgen.c	Tue Jun 13 15:05:31 2000
+++ freeciv/server/mapgen.c	Fri Jul 21 09:31:57 2000
@@ -1175,7 +1175,7 @@
       /* the first condition helps make terrain more contiguous,
 	 the second lets it avoid the coast: */
       if ( ( i*3>k*2 
-	     || is_special_type_close(x,y,S_RIVER)
+	     || count_special_near_tile(x, y, S_RIVER) > 0
 	     || myrand(100)<50 
 	     )
 	   &&( !is_at_coast(x, y) || myrand(100) < coast )) {