Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.35
diff -u -r1.35 savegame.c
--- server/savegame.c	2001/10/12 19:48:30	1.35
+++ server/savegame.c	2001/10/14 19:32:11
@@ -222,10 +222,12 @@
   for(y=0; y<map.ysize; y++) {
     char *terline=secfile_lookup_str(file, "map.t%03d", y);
     for(x=0; x<map.xsize; x++) {
-      char *pch;
-      if(!(pch=strchr(terrain_chars, terline[x]))) {
+      char *pch = strchr(terrain_chars, terline[x]);
+
+      if (!pch || terline[x] == '\0') {
  	freelog(LOG_FATAL, "unknown terrain type (map.t) in map "
-		"at position (%d,%d): %d '%c'", x, y, terline[x], terline[x]);
+		"at position (%d,%d): %u '%c'", x, y,
+		(unsigned char) terline[x], terline[x]);
 	exit(1);
       }
       map_get_tile(x, y)->terrain=pch-terrain_chars;
@@ -1223,10 +1225,12 @@
     for(y=0; y<map.ysize; y++) {
       char *terline=secfile_lookup_str(file, "player%d.map_t%03d", plrno, y);
       for(x=0; x<map.xsize; x++) {
-	char *pch;
-	if(!(pch=strchr(terrain_chars, terline[x]))) {
+	char *pch = strchr(terrain_chars, terline[x]);
+
+	if (!pch || terline[x] == 0) {
 	  freelog(LOG_FATAL, "unknown terrain type (map.t) in map "
-		  "at position (%d,%d): %d '%c'", x, y, terline[x], terline[x]);
+		  "at position (%d,%d): %u '%c'", x, y,
+		  (unsigned char) terline[x], terline[x]);
 	  exit(1);
 	}
 	map_get_player_tile(x, y, plr)->terrain=pch-terrain_chars;