/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, 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
*
* ---
*
- * 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.
*
* ---
*
*
*/
+#include <config.h>
+
#include "misc.h"
#include "player.h"
-#include "var.h"
#include "xy.h"
#include "sect.h"
#include "ship.h"
#include "land.h"
#include "nat.h"
#include "nsc.h"
-#include "deity.h"
#include "file.h"
#include "commands.h"
#include "optlist.h"
{
struct nstr_item ni;
union item_u item;
- int vec[I_MAX + 1];
- int itemvec[I_MAX + 1];
int type;
struct sctstr sect;
struct mchrstr *mp;
struct plchrstr *pp;
struct lchrstr *lp;
s_char *p;
- int i;
+ i_type i;
struct nstr_item ni2;
struct plnstr plane;
struct lndstr land;
|| islist(p))) {
s_char y_or_n[80], bbuf[80];
- bzero(y_or_n, 80);
+ memset(y_or_n, 0, sizeof(y_or_n));
if (type == EF_SHIP) {
if (*p == '*')
sprintf(bbuf, "all ships");
if (!confirm(y_or_n))
return RET_FAIL;
}
- while (nxtitem(&ni, (s_char *)&item)) {
+ while (nxtitem(&ni, &item)) {
if (!player->owner)
continue;
getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY))
continue;
}
- getvec(VT_ITEM, vec, (s_char *)§, EF_SECTOR);
if (type == EF_SHIP) {
eff = ((float)item.ship.shp_effic / 100.0);
mp = &mchr[(int)item.ship.shp_type];
}
}
pr("%s", prship(&item.ship));
- getvec(VT_ITEM, itemvec, (s_char *)&item.ship, EF_SHIP);
- for (i = 1; i <= I_MAX; i++) {
- vec[i] += itemvec[i];
+ for (i = I_NONE + 1; i <= I_MAX; i++) {
+ sect.sct_item[i] += item.ship.shp_item[i];
}
- vec[I_LCM] += mp->m_lcm * 2 / 3 * eff;
- vec[I_HCM] += mp->m_hcm * 2 / 3 * eff;
+ sect.sct_item[I_LCM] += mp->m_lcm * 2 / 3 * eff;
+ 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);
+ 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));
- getvec(VT_ITEM, itemvec, (s_char *)&item.land, EF_LAND);
- for (i = 1; i <= I_MAX; i++) {
- vec[i] += itemvec[i];
+ for (i = I_NONE + 1; i <= I_MAX; i++) {
+ sect.sct_item[i] += item.land.lnd_item[i];
}
-/* Military, guns and shells are not required to build land units */
-/* vec[I_MILIT] += total_mil(&item.land);*/
-/* vec[I_GUN] += lp->l_gun * 2 / 3 * eff;*/
-/* vec[I_SHELL] += lp->l_shell * 2 / 3 * eff;*/
- vec[I_LCM] += lp->l_lcm * 2 / 3 * eff;
- vec[I_HCM] += lp->l_hcm * 2 / 3 * eff;
+ sect.sct_item[I_LCM] += lp->l_lcm * 2 / 3 * eff;
+ sect.sct_item[I_HCM] += lp->l_hcm * 2 / 3 * eff;
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);
+ 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));
- vec[I_LCM] += pp->pl_lcm * 2 / 3 * eff;
- vec[I_HCM] += pp->pl_hcm * 2 / 3 * eff;
- vec[I_MILIT] += pp->pl_crew;
+ 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));
- putvec(VT_ITEM, vec, (s_char *)§, EF_SECTOR);
+ for (i = I_NONE + 1; i <= I_MAX; i++) {
+ if (sect.sct_item[i] > ITEM_MAX)
+ sect.sct_item[i] = ITEM_MAX;
+ }
putsect(§);
}
return RET_OK;
projects / empserver / blobdiff