Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.42
diff -u -r1.42 savegame.c
--- server/savegame.c	2001/12/21 11:17:45	1.42
+++ server/savegame.c	2001/12/22 19:33:58
@@ -1690,7 +1690,7 @@
 ***************************************************************/
 void game_load(struct section_file *file)
 {
-  int i, o;
+  int i;
   enum server_states tmp_server_state;
   char *savefile_options;
   char *string;
@@ -1981,14 +1981,17 @@
     for(i=0; i<game.nplayers; i++) {
       player_map_load(&game.players[i], i, file); 
     }
-    /* FIXME: This is a kluge to keep the AI working for the moment. */
-    /*        When the AI is taught to handle diplomacy, remove this. */
-    for (i = 0; i < game.nplayers; i++) {
-      struct player *pplayer = get_player(i);
+
+    /* FIXME: This is a kluge to keep the AI working until it can handle
+     * diplomacy.
+     * When loading old savegames the diplstate is set to DS_NEUTRAL,
+     * so we need to set it to DS_WAR for the AIs for now)
+     */
+    players_iterate(pplayer) {
       if (pplayer->ai.control) {
-	for (o = 0; o < game.nplayers; o++) {
-	  struct player *pother = get_player(o);
-	  if (pplayer != pother) {
+	players_iterate(pother) {
+	  if (pplayer != pother &&
+	      pplayer->diplstates[pother->player_no].type != DS_NO_CONTACT) {
 	    pplayer->diplstates[pother->player_no].type =
 	      pother->diplstates[pplayer->player_no].type =
 	      DS_WAR;
@@ -1996,9 +1999,9 @@
 	      pother->diplstates[pplayer->player_no].turns_left =
 	      16;
 	  }
-	}
+	} players_iterate_end;
       }
-    }
+    } players_iterate_end;
 
     /* We do this here since if the did it in player_load, player 1
        would try to unfog (unloaded) player 2's map when player 1's units