COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / scra.c

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index 2894998648542c5893566b90d2c4b1d23c588048..408e459a24959e98f272a1b82a4a89897210eb09 100644 (file)
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -32,9 +32,10 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
@@ -137,7 +138,7 @@ scra(void)
        if (!confirm(y_or_n))
            return RET_FAIL;
     }
-    while (nxtitem(&ni, (s_char *)&item)) {
+    while (nxtitem(&ni, &item)) {
        if (!player->owner)
            continue;
 
@@ -186,7 +187,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];
            }
@@ -194,7 +194,7 @@ scra(void)
            sect.sct_item[I_HCM] += mp->m_hcm * 2 / 3 * eff;
            getsect(item.ship.shp_x, item.ship.shp_y, &sect2);
            snxtitem_all(&ni2, EF_PLANE);
-           while (nxtitem(&ni2, (s_char *)&plane)) {
+           while (nxtitem(&ni2, &plane)) {
                if (plane.pln_own == 0)
                    continue;
                if (plane.pln_ship == item.ship.shp_uid) {
@@ -216,11 +216,11 @@ scra(void)
                    plane.pln_own = sect2.sct_own;
                    makenotlost(EF_PLANE, plane.pln_own, plane.pln_uid,
                                plane.pln_x, plane.pln_y);
-                   putplane(plane.pln_uid, (s_char *)&plane);
+                   putplane(plane.pln_uid, &plane);
                }
            }
            snxtitem_all(&ni2, EF_LAND);
-           while (nxtitem(&ni2, (s_char *)&land)) {
+           while (nxtitem(&ni2, &land)) {
                if (land.lnd_own == 0)
                    continue;
                if (land.lnd_ship == item.ship.shp_uid) {
@@ -242,18 +242,17 @@ scra(void)
                    land.lnd_own = sect2.sct_own;
                    makenotlost(EF_LAND, land.lnd_own, land.lnd_uid,
                                land.lnd_x, land.lnd_y);
-                   putland(land.lnd_uid, (s_char *)&land);
+                   putland(land.lnd_uid, &land);
                }
            }
            makelost(EF_SHIP, item.ship.shp_own, item.ship.shp_uid,
                     item.ship.shp_x, item.ship.shp_y);
            item.ship.shp_own = 0;
-           putship(item.ship.shp_uid, (s_char *)&item.ship);
+           putship(item.ship.shp_uid, &item.ship);
        } else if (type == EF_LAND) {
            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];
            }
@@ -262,7 +261,7 @@ scra(void)
            getsect(item.land.lnd_x, item.land.lnd_y, &sect2);
 
            snxtitem_all(&ni2, EF_LAND);
-           while (nxtitem(&ni2, (s_char *)&land)) {
+           while (nxtitem(&ni2, &land)) {
                if (land.lnd_own == 0)
                    continue;
                if (land.lnd_land == item.land.lnd_uid) {
@@ -284,12 +283,12 @@ scra(void)
                    land.lnd_own = sect2.sct_own;
                    makenotlost(EF_LAND, land.lnd_own, land.lnd_uid,
                                land.lnd_x, land.lnd_y);
-                   putland(land.lnd_uid, (s_char *)&land);
+                   putland(land.lnd_uid, &land);
                }
            }
 
            snxtitem_all(&ni2, EF_PLANE);
-           while (nxtitem(&ni2, (s_char *)&plane)) {
+           while (nxtitem(&ni2, &plane)) {
                if (plane.pln_own == 0)
                    continue;
                if (plane.pln_land == item.land.lnd_uid) {
@@ -311,28 +310,31 @@ scra(void)
                    plane.pln_own = sect2.sct_own;
                    makenotlost(EF_PLANE, plane.pln_own, plane.pln_uid,
                                plane.pln_x, plane.pln_y);
-                   putplane(plane.pln_uid, (s_char *)&plane);
+                   putplane(plane.pln_uid, &plane);
                }
            }
            makelost(EF_LAND, item.land.lnd_own, item.land.lnd_uid,
                     item.land.lnd_x, item.land.lnd_y);
            item.land.lnd_own = 0;
-           putland(item.land.lnd_uid, (s_char *)&item.land);
+           putland(item.land.lnd_uid, &item.land);
        } else {
            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;
            makelost(EF_PLANE, item.plane.pln_own, item.plane.pln_uid,
                     item.plane.pln_x, item.plane.pln_y);
            item.plane.pln_own = 0;
-           putplane(item.plane.pln_uid, (s_char *)&item.plane);
+           putplane(item.plane.pln_uid, &item.plane);
        }
        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;