(show, show_item): No new `show' features without matching machine

readable dumps.  Back out `show item' for 4.2.13.

diff --git a/include/prototypes.h b/include/prototypes.h
index f282a0416376384ef7361dbe668ef25258e08b57..fb523a2f39e4bb7e7bb710b4651dd1d1c4131f85 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -694,7 +694,6 @@ extern void shp_init(int, s_char *);
 /* show.c */
 extern void show_bridge(int);
 extern void show_tower(int);
-extern void show_item(int);
 extern void show_nuke_stats(int);
 extern void show_nuke_capab(int);
 extern void show_nuke_build(int);

diff --git a/info/Commands/show.t b/info/Commands/show.t
index 9a2d2c7a58e5255e224a2da8a51fb90057070f67..bcdfe3a2cf062ad2e4e8d63cb512c9b254028bdd 100644 (file)
--- a/info/Commands/show.t
+++ b/info/Commands/show.t
@@ -1,15 +1,15 @@
 .TH Command SHOW
-.NA show "Characteristics of bridges, items, ships, planes, land units or sectors"
+.NA show "Characteristics of bridges, ships, planes, land units or sectors"
 .LV Basic
-.SY "show <bridge|item|land|nuke|plane|sector|ship|tower> [b|s|c] [tech]"
+.SY "show <bridge|land|nuke|plane|sector|ship|tower> [b|s|c] [tech]"
 The show command describes the characteristics of bridge spans, bridge
-towers, items, planes, ships, land units, nukes, and sectors for a
+towers, planes, ships, land units, nukes, and sectors for a
 given technology level.
 .s1
 The format of each output is more fully described in separate info
 pages (Ship-types, Nuke-types, etc.).
 .s1
-Except for bridge (bridge span), tower (bridge tower) and item, a
+Except for bridge (bridge span) and tower (bridge tower), a
 further parameter is required to indicate whether you wish information
 about building (b), statistics (s) or capabilities (c) of the selected
 type.
@@ -35,4 +35,4 @@ will give something like
 3mt fusion       7 210  10  325 $19000
 .FI
 .s1
-.SA "Ship-types, Nuke-types, Plane-types, Unit-types, Sector-types, Item-types, Ships, Planes, LandUnits, Products"
+.SA "Ship-types, Nuke-types, Plane-types, Unit-types, Sector-types, Ships, Planes, LandUnits, Products"

diff --git a/info/Concepts/Item-types.t b/info/Concepts/Item-types.t
deleted file mode 100644 (file)
index 0f1e8ce..0000000
--- a/info/Concepts/Item-types.t
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH Concept "Item types"
-.NA Item-types "Characteristics of Items"
-.LV Basic
-.s1
-Items are the products produced in Empire.  Items are also known as
-Commodities.
-.s1
-The show command displays the detailed characteristics of items.
-.s1
-.EX show item
-.NF
-Printing for tech level '344'
-item   value sell lbs   packing   item
-mnemo                 rg wh ur bk name
-     c     1   no   1 10 10 10 10 civilians
-     m     0   no   1  1  1  1  1 military
-     s     5  yes   1  1 10  1  1 shells
-     g    60  yes  10  1 10  1  1 guns
-     p     4  yes   1  1 10  1  1 petrol
-     i     2  yes   1  1 10  1  1 iron ore
-     d    20  yes   5  1 10  1  1 dust (gold)
-     b   280  yes  50  1  5  1  4 bars of gold
-     f     0  yes   1  1 10  1  1 food
-     o     8  yes   1  1 10  1  1 oil
-     l     2  yes   1  1 10  1  1 light products
-     h     4  yes   1  1 10  1  1 heavy products
-     u     1  yes   2  1  2  1  1 uncompensated workers
-     r   150  yes   8  1 10  1  1 radioactive materials
-.FI
-.s1
-The meaning of the headings are:
-.in \w'packing wh\0\0'u
-.L "item mnemo"
-A one-letter mnemonic abbreviation of the item name.  Commands let you
-use this to select the item.
-.L value
-The value if the item is mortgaged.
-.L sell
-Whether you can sell the item on the market.
-.L lbs
-The weight of the item, which determines how much mobility it takes to
-move it.
-.L "packing rg"
-The packing bonus the item receives in regular sectors.
-.L "packing wh"
-The packing bonus the item receives in warehouse sectors.
-.L "packing ur"
-The packing bonus the item receives in urban sectors.
-.L "packing bk"
-The packing bonus the item receives in bank sectors.
-.L "item name"
-The full name of the item.
-.in
-.s1
-To find out which sectors are in what packing groups, try the "show
-sector s" command.
-.s1
-.SA "Commodities, Products, show, Sector-types, Production"

diff --git a/src/lib/commands/show.c b/src/lib/commands/show.c
index 0ed045b491f754cd9e4da65f6bde3fe330897641..f9cfdb54734fa405237653b5e9fb2fd0e18c75a9 100644 (file)
--- a/src/lib/commands/show.c
+++ b/src/lib/commands/show.c
@@ -55,7 +55,7 @@ show(void)
     int rlev;
 
     if (!(p = getstarg(player->argp[1],
-                      "Describe what (plane, nuke, bridge, ship, sect, land unit, tower, item)? ",
+                      "Describe what (plane, nuke, bridge, ship, sect, land unit, tower)? ",
                       buf))
        || !*p)
        return RET_SYN;
@@ -82,9 +82,6 @@ show(void)
     case 't':
        show_tower(99999);
        return RET_OK;
-    case 'i':
-       show_item(99999);
-       return RET_OK;
     case 'n':
        if (opt_DRNUKE)
            tlev = ((rlev / drnuke_const) > tlev ? tlev :

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 133b606c78e82b4d5d9edbc7719fc2141db9b2ca..c1f7ac200417392c149dd43c6d376e1802375f9d 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -262,23 +262,6 @@ show_tower(int tlev)
        1 + (buil_tower_bh * 40 / 100), buil_tower_bc);
 }
 
-void
-show_item(int tlev)
-{
-    register struct ichrstr *ip;
-    register int n;
-
-    pr("item   value sell lbs   packing   item\n");
-    pr("mnemo                 rg wh ur bk name\n");
-
-    for (n = 1; n <= itm_maxno; n++) {
-       ip = &ichr[n];
-       pr("     %c %5d %4s %3d %2d %2d %2d %2d %s\n",
-          ip->i_mnem, ip->i_value, (ip->i_sell == 1) ? "yes" : "no",
-          ip->i_lbs, ip->i_pkg[NPKG], ip->i_pkg[WPKG], ip->i_pkg[UPKG],
-          ip->i_pkg[BPKG], ip->i_name);
-    }
-}
 void
 show_nuke_stats(int tlev)
 {