/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
*
* Known contributors to this file:
* Steve McClure, 2000
- *
*/
-#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 <config.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)))
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) {
if (!confirm(y_or_n))
return RET_FAIL;
}
- while (nxtitem(&ni, (s_char *)&item)) {
+ while (nxtitem(&ni, &item)) {
if (!player->owner)
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;
}
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) {
sect.sct_item[I_HCM] += mp->m_hcm * 2 / 3 * eff;
getsect(item.ship.shp_x, item.ship.shp_y, §2);
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) {
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) {
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);
+ 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++) {
getsect(item.land.lnd_x, item.land.lnd_y, §2);
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) {
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) {
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);
+ 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;
- putplane(item.plane.pln_uid, (s_char *)&item.plane);
+ item.plane.pln_effic = 0;
+ putplane(item.plane.pln_uid, &item.plane);
}
pr(" scrapped in %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
projects / empserver / blobdiff