[Freeciv-Dev] (PR#11557) remove an rtech user in helpdata.c

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

The rtech values cathedral_plus, cathedral_minus, colosseum_plus, 
temple_plus should be removed.

This patch is a step toward that.  It removes the user in helpdata that 
automatically (and possibly wrongly) generates the helptext.  In its 
place the text goes directly into the ruleset tech helptext.

-jason

Index: client/helpdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdata.c,v
retrieving revision 1.90
diff -u -r1.90 helpdata.c
--- client/helpdata.c   8 Dec 2004 20:48:33 -0000       1.90
+++ client/helpdata.c   16 Dec 2004 22:59:16 -0000
@@ -1038,6 +1038,7 @@
   if (tech_flag(i, TF_POPULATION_POLLUTION_INC))
     sprintf(buf + strlen(buf), _("* Increases the pollution generated by "
                                 "the population.\n"));
+#if 0
   if (game.rtech.cathedral_plus == i)
     sprintf(buf + strlen(buf), _("* Improves the effect of Cathedrals.\n"));
   if (game.rtech.cathedral_minus == i)
@@ -1046,6 +1047,7 @@
     sprintf(buf + strlen(buf), _("* Improves the effect of Colosseums.\n"));
   if (game.rtech.temple_plus == i)
     sprintf(buf + strlen(buf), _("* Improves the effect of Temples.\n"));
+#endif
 
   if (tech_flag(i, TF_BRIDGE)) {
     const char *units_str = get_units_with_flag_string(F_SETTLERS);
Index: data/civ1/techs.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1/techs.ruleset,v
retrieving revision 1.16
diff -u -r1.16 techs.ruleset
--- data/civ1/techs.ruleset     29 Nov 2004 22:22:24 -0000      1.16
+++ data/civ1/techs.ruleset     16 Dec 2004 22:59:16 -0000
@@ -373,6 +373,7 @@
 req1     = "Ceremonial Burial"
 req2     = "None"
 flags    = ""
+helptext = _("Improves the effect of Temples.")
 
 [advance_navigation]
 name     = _("Navigation")
Index: data/civ2/techs.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2/techs.ruleset,v
retrieving revision 1.18
diff -u -r1.18 techs.ruleset
--- data/civ2/techs.ruleset     29 Nov 2004 22:22:25 -0000      1.18
+++ data/civ2/techs.ruleset     16 Dec 2004 22:59:16 -0000
@@ -133,6 +133,7 @@
 req1     = "Philosophy"
 req2     = "Industrialization"
 flags    = ""
+helptext = _("Reduces the effect of Cathedrals.")
 
 [advance_computers]
 name     = _("Computers")
@@ -175,6 +176,7 @@
 req1     = "Metallurgy"
 req2     = "Magnetism"
 flags    = ""
+helptext = _("Improves the effect of Colosseums.")
 
 [advance_electronics]
 name     = _("Electronics")
@@ -373,6 +375,7 @@
 req1     = "Ceremonial Burial"
 req2     = "None"
 flags    = ""
+helptext = _("Improves the effect of Temples.")
 
 [advance_navigation]
 name     = _("Navigation")
@@ -535,6 +538,7 @@
 req1     = "Feudalism"
 req2     = "Monotheism"
 flags    = ""
+helptext = _("Improves the effect of Cathedrals.")
 
 [advance_theory_of_gravity]
 name     = _("Theory of Gravity")
Index: data/default/techs.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/techs.ruleset,v
retrieving revision 1.24
diff -u -r1.24 techs.ruleset
--- data/default/techs.ruleset  29 Nov 2004 22:22:25 -0000      1.24
+++ data/default/techs.ruleset  16 Dec 2004 22:59:16 -0000
@@ -182,6 +182,7 @@
 flags    = ""
 graphic     = "a.communism"
 graphic_alt = "-"
+helptext = _("Reduces the effect of Cathedrals.")
 
 [advance_computers]
 name     = _("Computers")
@@ -238,6 +239,7 @@
 flags    = ""
 graphic     = "a.electricity"
 graphic_alt = "-"
+helptext = _("Improves the effect of Colosseums.")
 
 [advance_electronics]
 name     = _("Electronics")
@@ -502,6 +504,7 @@
 flags    = ""
 graphic     = "a.mysticism"
 graphic_alt = "-"
+helptext = _("Improves the effect of Temples.")
 
 [advance_navigation]
 name     = _("Navigation")
@@ -720,6 +723,7 @@
 flags    = ""
 graphic     = "a.theology"
 graphic_alt = "-"
+helptext = _("Improves the effect of Cathedrals.")
 
 [advance_theory_of_gravity]
 name     = _("Theory of Gravity")
Index: data/history/techs.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/history/techs.ruleset,v
retrieving revision 1.4
diff -u -r1.4 techs.ruleset
--- data/history/techs.ruleset  29 Nov 2004 22:22:26 -0000      1.4
+++ data/history/techs.ruleset  16 Dec 2004 22:59:18 -0000
@@ -133,6 +133,7 @@
 req1     = "Philosophy"
 req2     = "Industrialization"
 flags    = ""
+helptext = _("Reduces the effect of Cathedrals.")
 
 [advance_computers]
 name     = _("Computers")
@@ -175,6 +176,7 @@
 req1     = "Metallurgy"
 req2     = "Industrialization"
 flags    = ""
+helptext = _("Improves the effect of Colosseums.")
 
 [advance_electronics]
 name     = _("Electronics")
@@ -373,6 +375,7 @@
 req1     = "Ceremonial Burial"
 req2     = "None"
 flags    = ""
+helptext = _("Improves the effect of Temples.")
 
 [advance_navigation]
 name     = _("Navigation")
@@ -537,6 +540,7 @@
 req1     = "Feudalism"
 req2     = "Monotheism"
 flags    = ""
+helptext = _("Improves the effect of Cathedrals.")
 
 [advance_theory_of_gravity]
 name     = _("Theory of Gravity")