/*
* 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
#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;
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 = item.land.lnd_effic / 100.0;
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 = item.land.lnd_effic / 100.0;
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",