[freeciv-dev] Patch for hard-coded help text.

["Bobby D. Bryant" <bdbryant@xxxxxxxxxxxxxxx>]

This pair of near-identical patches (one for each widget set) replaces
some hardcoded text that is overly specific to the standard game with
some more general verbiage that will be more correct under certain
ruleset modifications.  I am referring to the situation where "Pikemen"
have their defense doubled against "horseback (except Cavalry)"; the
flags in units.ruleset allow a more general combination of the units
participating in the effect.

I also corrected a helptext spelling error that I noticed nearby in the
code ("aboad" --> "aboard").

Thank you to whoever already commented out the bit about the Elephants
in helpdata.txt.

The patches apply to the CVS snapshot dated 11-Jun, which I just
downloaded this morning.

Bobby Bryant
Austin, Texas

--- client/gui-gtk/helpdlg.c-orig       Sat Jun 12 09:38:40 1999
+++ client/gui-gtk/helpdlg.c    Sat Jun 12 09:41:03 1999
@@ -930,13 +930,13 @@
       sprintf(buf+strlen(buf), "* Can attack enemy air units.\n");
     }
     if (unit_flag(i, F_MARINES)) {
-      sprintf(buf+strlen(buf), "* Can attack from aboad sea units: against 
enemy cities and\n  onto land squares.");
+      sprintf(buf+strlen(buf), "* Can attack from aboard sea units: against 
enemy cities and\n  onto land squares.");
     }
     if (unit_flag(i, F_PIKEMEN)) {
-      sprintf(buf+strlen(buf), "* Gets double defense against horseback units 
(other than Cavalry).\n");
+      sprintf(buf+strlen(buf), "* Gets double defense against units specified 
as 'mounted'.\n");
     }
     if (unit_flag(i, F_HORSE)) {
-      sprintf(buf+strlen(buf), "* Counts as a horseback unit against 
Pikemen.\n");
+      sprintf(buf+strlen(buf), "* Counts as 'mounted' against certain 
defenders.\n");
     }
     if (unit_flag(i, F_MISSILE)) {
       sprintf(buf+strlen(buf), "* A missile unit: gets used up in making an 
attack.\n");

--- client/gui-xaw/helpdlg.c-orig       Sat Jun 12 09:38:53 1999
+++ client/gui-xaw/helpdlg.c    Sat Jun 12 09:40:01 1999
@@ -1043,13 +1043,13 @@
       sprintf(buf+strlen(buf), "* Can attack enemy air units.\n");
     }
     if (unit_flag(i, F_MARINES)) {
-      sprintf(buf+strlen(buf), "* Can attack from aboad sea units: against 
enemy cities and\n  onto land squares.");
+      sprintf(buf+strlen(buf), "* Can attack from aboard sea units: against 
enemy cities and\n  onto land squares.");
     }
     if (unit_flag(i, F_PIKEMEN)) {
-      sprintf(buf+strlen(buf), "* Gets double defense against horseback units 
(other than Cavalry).\n");
+      sprintf(buf+strlen(buf), "* Gets double defense against units specified 
as 'mounted'.\n");
     }
     if (unit_flag(i, F_HORSE)) {
-      sprintf(buf+strlen(buf), "* Counts as a horseback unit against 
Pikemen.\n");
+      sprintf(buf+strlen(buf), "* Counts as 'mounted' against certain 
defenders.\n");
     }
     if (unit_flag(i, F_MISSILE)) {
       sprintf(buf+strlen(buf), "* A missile unit: gets used up in making an 
attack.\n");