[Freeciv-Dev] (PR#13141) remove farmland-supermarket value from terrain.ruleset

["Jason Dorje Short" <jdorje@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13141 >

This value isn't used anymore apparently; it's an effect now.  But we/I
forgot to remove the old value.

-jason

Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.247
diff -u -r1.247 capstr.c
--- common/capstr.c     11 May 2005 20:03:08 -0000      1.247
+++ common/capstr.c     19 May 2005 15:51:26 -0000
@@ -82,7 +82,7 @@
  *     as long as possible.  We want to maintain network compatibility with
  *     the stable branch for as long as possible.
  */
-#define CAPABILITY "+Freeciv.Devel.2005.May.11-2"
+#define CAPABILITY "+Freeciv.Devel.2005.May.19"
 
 void init_our_capability(void)
 {
Index: common/packets.def
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.def,v
retrieving revision 1.125
diff -u -r1.125 packets.def
--- common/packets.def  11 May 2005 20:03:08 -0000      1.125
+++ common/packets.def  19 May 2005 15:51:26 -0000
@@ -1130,7 +1130,6 @@
   UINT16 fortress_defense_bonus;        /* % added to defense if fortress */
   UINT16 road_superhighway_trade_bonus;  # % added to trade if road/s-highway
   UINT16 rail_tile_bonus[O_MAX];        /* % added to output if railroad */
-  UINT16 farmland_supermarket_food_bonus;# % added to food if farm/s-market
   UINT8 pollution_tile_penalty[O_MAX]; /* % taken from output if polluted */
   UINT8 fallout_tile_penalty[O_MAX]; /* % taken from output if polluted */
 end
Index: data/civ1/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/terrain.ruleset,v
retrieving revision 1.32
diff -u -r1.32 terrain.ruleset
--- data/civ1/terrain.ruleset   26 Apr 2005 06:57:36 -0000      1.32
+++ data/civ1/terrain.ruleset   19 May 2005 15:51:26 -0000
@@ -64,9 +64,6 @@
 ; percent added to trade production if square has railroad
 rail_trade_bonus=50
 
-; percent added to food production if farmland and city has supermarket
-farmland_supermarket_food_bonus=0
-
 ; percent subtracted from food production if square is polluted
 pollution_food_penalty=50
 
Index: data/civ2/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/terrain.ruleset,v
retrieving revision 1.34
diff -u -r1.34 terrain.ruleset
--- data/civ2/terrain.ruleset   26 Apr 2005 06:57:36 -0000      1.34
+++ data/civ2/terrain.ruleset   19 May 2005 15:51:26 -0000
@@ -72,9 +72,6 @@
 ; percent added to trade production if square has railroad
 rail_trade_bonus=0
 
-; percent added to food production if farmland and city has supermarket
-farmland_supermarket_food_bonus=50
-
 ; percent subtracted from food production if square is polluted
 pollution_food_penalty=50
 
Index: data/default/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/terrain.ruleset,v
retrieving revision 1.38
diff -u -r1.38 terrain.ruleset
--- data/default/terrain.ruleset        26 Apr 2005 06:57:36 -0000      1.38
+++ data/default/terrain.ruleset        19 May 2005 15:51:26 -0000
@@ -75,9 +75,6 @@
 ; percent added to trade production if square has railroad
 rail_trade_bonus=0
 
-; percent added to food production if farmland and city has supermarket
-farmland_supermarket_food_bonus=50
-
 ; percent subtracted from food production if square is polluted
 pollution_food_penalty=50
 
Index: data/history/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/terrain.ruleset,v
retrieving revision 1.16
diff -u -r1.16 terrain.ruleset
--- data/history/terrain.ruleset        26 Apr 2005 06:57:37 -0000      1.16
+++ data/history/terrain.ruleset        19 May 2005 15:51:26 -0000
@@ -72,9 +72,6 @@
 ; percent added to trade production if square has railroad
 rail_trade_bonus=0
 
-; percent added to food production if farmland and city has supermarket
-farmland_supermarket_food_bonus=50
-
 ; percent subtracted from food production if square is polluted
 pollution_food_penalty=50
 
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.265
diff -u -r1.265 ruleset.c
--- server/ruleset.c    14 May 2005 22:33:42 -0000      1.265
+++ server/ruleset.c    19 May 2005 15:51:27 -0000
@@ -1443,8 +1443,6 @@
                                   "parameters.fallout_%s_penalty",
                                   get_output_identifier(o));
   } output_type_iterate_end;
-  terrain_control.farmland_supermarket_food_bonus =
-    secfile_lookup_int_default(file, 50, 
"parameters.farmland_supermarket_food_bonus");
 
   sec = secfile_get_secnames_prefix(file, "terrain_", &nval);