? rc
? msgfmt1.diff
? tech_info1.diff
? pluralforms.diff
? diff
? causescore
? check_headers.sh
? test.c
? prevnext.patch
? future_fix1.diff
? PLURAL_FORMS.readme
? plural_forms_clientgtk.diff
? plural_forms_clientxaw.diff
? plural_forms_server.diff
? local_warmap131201.diff
? load_map_data-fix.diff
? queue
? unit_move_turns1.diff
? savegame_isnewgame.diff
? po/diff
Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.46
diff -u -r1.46 savegame.c
--- server/savegame.c	2002/01/17 05:30:59	1.46
+++ server/savegame.c	2002/01/17 09:37:32
@@ -843,8 +843,12 @@
       for(x=0; x<CITY_MAP_SIZE; x++) {
 	pcity->city_map[x][y] =
 	    is_valid_city_coords(x, y) ? C_TILE_EMPTY : C_TILE_UNAVAILABLE;
-        if (*p=='0') {
-	  set_worker_city(pcity, x, y, C_TILE_EMPTY);
+	if (*p == '0') {
+	  int map_x, map_y;
+
+	  set_worker_city(pcity, x, y,
+			  city_map_to_map(&map_x, &map_y, pcity, x, y) ?
+			  C_TILE_EMPTY : C_TILE_UNAVAILABLE);
 	} else if (*p=='1') {
 	  int map_x, map_y, is_real;