diff -Nur -X/home/thue/freeciv-dev/freeciv/diff_ignore freeciv/common/city.c bugciv/common/city.c
--- freeciv/common/city.c	Sat Aug 12 21:09:01 2000
+++ bugciv/common/city.c	Sat Aug 12 21:12:12 2000
@@ -880,9 +880,6 @@
   else
     s=get_tile_type(tile_t)->shield;
 
-  if (s<game.rgame.min_city_center_shield && x==2 && y==2)
-    s=game.rgame.min_city_center_shield;
-
   if (spec_t & S_MINE) {
     s += (get_tile_type(tile_t))->mining_shield_incr;
   }
@@ -901,6 +898,10 @@
     s-=(s*terrain_control.pollution_shield_penalty)/100; /* The shields here are icky */
   if (spec_t & S_FALLOUT)
     s-=(s*terrain_control.fallout_shield_penalty)/100;
+
+  if (s<game.rgame.min_city_center_shield && x==2 && y==2)
+    s=game.rgame.min_city_center_shield;
+
   return s;
 }
 
@@ -958,9 +959,6 @@
   else
     t=get_tile_type(tile_t)->trade;
 
-  if (t<game.rgame.min_city_center_trade && x==2 && y==2)
-    t=game.rgame.min_city_center_trade;
-
   if ((spec_t & S_RIVER) && (tile_t != T_OCEAN)) {
     t += terrain_control.river_trade_incr;
   }
@@ -993,6 +991,10 @@
     if (spec_t & S_FALLOUT)
       t-=(t*terrain_control.fallout_trade_penalty)/100;
   }
+
+  if (t<game.rgame.min_city_center_trade && x==2 && y==2)
+    t=game.rgame.min_city_center_trade;
+
   return t;
 }
 
@@ -1057,9 +1059,6 @@
   else
     f=get_tile_type(tile_t)->food;
 
-  if (f<game.rgame.min_city_center_food && x==2 && y==2)
-    f=game.rgame.min_city_center_food;
-
   if ((spec_t & S_IRRIGATION) || city_auto_water) {
     f += type->irrigation_food_incr;
     if (((spec_t & S_FARMLAND) ||
@@ -1085,6 +1084,9 @@
     f-=(f*terrain_control.pollution_food_penalty)/100; /* The food here is yucky */
   if (spec_t & S_FALLOUT)
     f-=(f*terrain_control.fallout_food_penalty)/100;
+
+  if (f<game.rgame.min_city_center_food && x==2 && y==2)
+    f=game.rgame.min_city_center_food;
 
   return f;
 }