? client/agents
Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.223
diff -u -r1.223 packhand.c
--- client/packhand.c	2002/02/27 11:46:15	1.223
+++ client/packhand.c	2002/03/04 17:42:09
@@ -423,7 +423,6 @@
   pcity->airlift=packet->airlift;
 
   pcity->turn_last_built=packet->turn_last_built;
-  pcity->turn_changed_target=packet->turn_changed_target;
   pcity->changed_from_id=packet->changed_from_id;
   pcity->changed_from_is_unit=packet->changed_from_is_unit;
   pcity->before_change_shields=packet->before_change_shields;
Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.153
diff -u -r1.153 city.c
--- common/city.c	2002/03/04 09:01:17	1.153
+++ common/city.c	2002/03/04 17:42:09
@@ -1228,14 +1228,6 @@
 
   if (apply_it) {
     pcity->shield_stock = shield_stock_after_adjustment;
-
-    if (new_class != orig_class) {
-      /* This is buggy; the interval between turns is not constant. */
-      pcity->turn_changed_target = game.year; 
-    } else {
-      /* Pretend we have changed nothing */
-      pcity->turn_changed_target = GAME_START_YEAR;
-    }
   }
 
   return shield_stock_after_adjustment;
Index: common/city.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.h,v
retrieving revision 1.104
diff -u -r1.104 city.h
--- common/city.h	2002/03/04 09:01:17	1.104
+++ common/city.h	2002/03/04 17:42:09
@@ -267,7 +267,6 @@
   int did_buy;
   bool did_sell, is_updated;
   int turn_last_built;	      /* The last year in which something was built */
-  int turn_changed_target;    /* Suffer shield loss at most once per turn */
   int changed_from_id;	      /* If changed this turn, what changed from (id) */
   bool changed_from_is_unit;   /* If changed this turn, what changed from (unit?) */
   int disbanded_shields;      /* If you disband unit in a city. Count them */
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.193
diff -u -r1.193 packets.c
--- common/packets.c	2002/03/02 19:57:22	1.193
+++ common/packets.c	2002/03/04 17:42:10
@@ -2379,7 +2379,6 @@
   cptr=put_uint8(cptr, req->currently_building);
 
   cptr=put_sint16(cptr, req->turn_last_built);
-  cptr=put_sint16(cptr, req->turn_changed_target);
   cptr=put_uint8(cptr, req->changed_from_id);
   cptr=put_uint16(cptr, req->before_change_shields);
 
@@ -2471,7 +2470,6 @@
   iget_uint8(&iter, &packet->currently_building);
 
   iget_sint16(&iter, &packet->turn_last_built);
-  iget_sint16(&iter, &packet->turn_changed_target);
   iget_uint8(&iter, &packet->changed_from_id);
   iget_uint16(&iter, &packet->before_change_shields);
 
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.108
diff -u -r1.108 packets.h
--- common/packets.h	2002/02/26 17:24:26	1.108
+++ common/packets.h	2002/03/04 17:42:10
@@ -348,9 +348,7 @@
 
   bool is_building_unit;
   int currently_building;
-
   int turn_last_built;
-  int turn_changed_target;
   int changed_from_id;
   bool changed_from_is_unit;
   int before_change_shields;
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.172
diff -u -r1.172 citytools.c
--- server/citytools.c	2002/03/03 09:51:56	1.172
+++ server/citytools.c	2002/03/04 17:42:10
@@ -972,7 +972,6 @@
     update_all_effects();
   }
   pcity->turn_last_built = game.year;
-  pcity->turn_changed_target = game.year;
   pcity->changed_from_id = 0;
   pcity->changed_from_is_unit = FALSE;
   pcity->before_change_shields = 0;
@@ -1576,7 +1575,6 @@
   packet->currently_building=pcity->currently_building;
 
   packet->turn_last_built=pcity->turn_last_built;
-  packet->turn_changed_target=pcity->turn_changed_target;
   packet->changed_from_id=pcity->changed_from_id;
   packet->changed_from_is_unit=pcity->changed_from_is_unit;
   packet->before_change_shields=pcity->before_change_shields;
Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.66
diff -u -r1.66 savegame.c
--- server/savegame.c	2002/02/27 11:46:21	1.66
+++ server/savegame.c	2002/03/04 17:42:11
@@ -787,9 +787,6 @@
     pcity->turn_last_built=
       secfile_lookup_int_default(file, GAME_START_YEAR,
 				 "player%d.c%d.turn_last_built", plrno, i);
-    pcity->turn_changed_target=
-      secfile_lookup_int_default(file, GAME_START_YEAR,
-				 "player%d.c%d.turn_changed_target", plrno, i);
     pcity->changed_from_id=
       secfile_lookup_int_default(file, pcity->currently_building,
 				 "player%d.c%d.changed_from_id", plrno, i);
@@ -1448,8 +1445,6 @@
 		       plrno, i);
     secfile_insert_int(file, pcity->turn_last_built,
 		       "player%d.c%d.turn_last_built", plrno, i);
-    secfile_insert_int(file, pcity->turn_changed_target,
-		       "player%d.c%d.turn_changed_target", plrno, i);
     secfile_insert_int(file, pcity->changed_from_id,
 		       "player%d.c%d.changed_from_id", plrno, i);
     secfile_insert_bool(file, pcity->changed_from_is_unit,