(scra): Obey ITEM_MAX.

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 2894998648542c5893566b90d2c4b1d23c588048..2b591856f06c08615c884503d9a47b857b1e928b 100644 (file)
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -186,7 +186,6 @@ scra(void)
                }
            }
            pr("%s", prship(&item.ship));
-           /* FIXME obey ITEM_MAX */
            for (i = I_NONE + 1; i <= I_MAX; i++) {
                sect.sct_item[i] += item.ship.shp_item[i];
            }
@@ -253,7 +252,6 @@ scra(void)
            eff = ((float)item.land.lnd_effic / 100.0);
            lp = &lchr[(int)item.land.lnd_type];
            pr("%s", prland(&item.land));
-           /* FIXME obey ITEM_MAX */
            for (i = I_NONE + 1; i <= I_MAX; i++) {
                sect.sct_item[i] += item.land.lnd_item[i];
            }
@@ -322,7 +320,6 @@ scra(void)
            eff = ((float)item.land.lnd_effic / 100.0);
            pp = &plchr[(int)item.plane.pln_type];
            pr("%s", prplane(&item.plane));
-           /* FIXME obey ITEM_MAX */
            sect.sct_item[I_LCM] += pp->pl_lcm * 2 / 3 * eff;
            sect.sct_item[I_HCM] += pp->pl_hcm * 2 / 3 * eff;
            sect.sct_item[I_MILIT] += pp->pl_crew;
@@ -333,6 +330,10 @@ scra(void)
        }
        pr(" scrapped in %s\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum));
+       for (i = I_NONE + 1; i <= I_MAX; i++) {
+           if (sect.sct_item[i] > ITEM_MAX)
+               sect.sct_item[i] = ITEM_MAX;
+       }
        putsect(&sect);
     }
     return RET_OK;