Update copyright notice.

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

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index f17622a6eb07acb939a1e338dd5182b3f120f55f..fc7e18be7e21d719220caa8046ef30a246538cd5 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -33,43 +33,29 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "ship.h"
-#include "plane.h"
-#include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
+#include "empobj.h"
 #include "optlist.h"
 
-union item_u {
-    struct shpstr ship;
-    struct plnstr plane;
-    struct lndstr land;
-};
-
 int
 scra(void)
 {
     struct nstr_item ni;
-    union item_u item;
+    union empobj_storage item;
     int type;
     struct sctstr sect;
     struct mchrstr *mp;
     struct plchrstr *pp;
     struct lchrstr *lp;
-    s_char *p;
+    char *p;
     i_type i;
     struct nstr_item ni2;
     struct plnstr plane;
     struct lndstr land;
     struct sctstr sect2;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     float eff;
 
     if (!(p = getstarg(player->argp[1], "Ship, land, or plane? ", buf)))
@@ -95,7 +81,7 @@ scra(void)
        return RET_SYN;
     if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
              || islist(p))) {
-       s_char y_or_n[80], bbuf[80];
+       char y_or_n[80], bbuf[80];
 
        memset(y_or_n, 0, sizeof(y_or_n));
        if (type == EF_SHIP) {
@@ -142,7 +128,7 @@ scra(void)
            continue;
 
        if (opt_MARKET) {
-           if (ontradingblock(type, (int *)&item.ship)) {
+           if (ontradingblock(type, &item.ship)) {
                pr("You cannot scrap an item on the trading block!\n");
                continue;
            }
@@ -171,7 +157,7 @@ scra(void)
                continue;
        }
        if (type == EF_SHIP) {
-           eff = ((float)item.ship.shp_effic / 100.0);
+           eff = item.ship.shp_effic / 100.0;
            mp = &mchr[(int)item.ship.shp_type];
            if (opt_TRADESHIPS) {
                if (mp->m_flags & M_TRADE) {
@@ -244,12 +230,10 @@ scra(void)
                    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;
+           item.ship.shp_effic = 0;
            putship(item.ship.shp_uid, &item.ship);
        } else if (type == EF_LAND) {
-           eff = ((float)item.land.lnd_effic / 100.0);
+           eff = item.land.lnd_effic / 100.0;
            lp = &lchr[(int)item.land.lnd_type];
            pr("%s", prland(&item.land));
            for (i = I_NONE + 1; i <= I_MAX; i++) {
@@ -312,20 +296,16 @@ scra(void)
                    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;
+           item.land.lnd_effic = 0;
            putland(item.land.lnd_uid, &item.land);
        } else {
-           eff = ((float)item.land.lnd_effic / 100.0);
+           eff = item.land.lnd_effic / 100.0;
            pp = &plchr[(int)item.plane.pln_type];
            pr("%s", prplane(&item.plane));
            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;
+           item.plane.pln_effic = 0;
            putplane(item.plane.pln_uid, &item.plane);
        }
        pr(" scrapped in %s\n",