--- freeciv/server/maphand.h	Sat Jun 12 12:44:52 1999
+++ freeciv-jk/server/maphand.h	Fri Aug 27 12:32:34 1999
@@ -34,6 +34,7 @@
 void map_save(struct section_file *file);
 void map_startpos_load(struct section_file *file);
 void map_tiles_load(struct section_file *file);
+void map_specials_next_load(struct section_file *file);
 void map_load(struct section_file *file);
 
 #endif  /* FC__MAPHAND_H */
--- freeciv/server/maphand.c	Sat Aug 14 12:47:37 1999
+++ freeciv-jk/server/maphand.c	Fri Aug 27 13:16:16 1999
@@ -449,6 +449,34 @@
     }
   }
 }
+
+/***************************************************************
+load the "next" bits of specials of map from a savegame file
+***************************************************************/
+void map_specials_next_load(struct section_file *file)
+{
+  int x, y;
+
+  /* get "next" 4 bits of special flags */
+  for(y=0; y<map.ysize; y++) {
+    char *terline=secfile_lookup_str_default(file, NULL, "map.n%03d", y);
+
+    if (terline) {
+      for(x=0; x<map.xsize; x++) {
+	char ch=terline[x];
+
+	if(isxdigit(ch)) {
+	  map_get_tile(x, y)->special|=(ch-(isdigit(ch) ? '0' : 'a'-10))<<8;
+	} else if(ch!=' ') {
+	  freelog(LOG_FATAL, "unknown special flag(next) (map.n) in map "
+		  "at position(%d,%d): %d '%c'", x, y, ch, ch);
+	  exit(1);
+	}
+      }
+    }
+  }
+}
+
 /***************************************************************
 load a complete map from a savegame file
 ***************************************************************/
@@ -501,23 +529,7 @@
   }
 
   /* get "next" 4 bits of special flags */
-  for(y=0; y<map.ysize; y++) {
-    char *terline=secfile_lookup_str_default(file, NULL, "map.n%03d", y);
-
-    if (terline) {
-      for(x=0; x<map.xsize; x++) {
-	char ch=terline[x];
-
-	if(isxdigit(ch)) {
-	  map_get_tile(x, y)->special|=(ch-(isdigit(ch) ? '0' : 'a'-10))<<8;
-	} else if(ch!=' ') {
-	  freelog(LOG_FATAL, "unknown special flag(next) (map.n) in map "
-		  "at position(%d,%d): %d '%c'", x, y, ch, ch);
-	  exit(1);
-	}
-      }
-    }
-  }
+  map_specials_next_load(file);
 
   /* get bits 0-3 of known flags */
   for(y=0; y<map.ysize; y++) {
--- freeciv/server/gamehand.c	Sat Aug 28 12:43:09 1999
+++ freeciv-jk/server/gamehand.c	Fri Aug 27 13:38:48 1999
@@ -366,7 +375,9 @@
       }
 
       if (tmp_server_state==PRE_GAME_STATE &&
-	  map.generator == 0) { /* generator 0 = map done with map editor */
+	  (map.generator == 0 || map.generator == 5) ) { 
+               /* generator 0 = map done with map editor, rivers as terrain */
+               /* generator 5 = map done with map editor, rivers as special */
         if (has_capability("specials",savefile_options)) {
           map_load(file);
           section_file_check_unused(file, NULL);
@@ -374,6 +385,10 @@
           return 1; /* make this a type 1 scenario */
         }
         map_tiles_load(file);
+        if (map.generator == 5) {  /* if rivers are specials, load them  */
+          map_specials_next_load(file);
+          map.generator = 0;       /* then become a normal hand-made map */
+        }
         if (has_capability("startpos",savefile_options)) {
           map_startpos_load(file);
           return 2; /* make this a type 2 scenario */