(nxtitemp, trade_getitem, trade_desc, trade_check_item_ok, nxtitem,
oprange, show_mission, nameofitem, build_mission_list_type, unit_map, xdvisible, trdswitchown, ontradingblock, trad, check_trade, unit_type_name, start_stop_unit, scut, scra, mission, multifire, perform_mission, fuel, NSC_GENITEM): Replace struct genitem with struct empobj. Remove genitem.h and create a new file empobj.h. Replace multiple instances of unions of ef_type structures with one standard union empobj_storage which is a superset of the individual instances.
This commit is contained in:
parent
9e75e5e009
commit
79ee88f7c6
29 changed files with 191 additions and 270 deletions
|
@ -35,31 +35,20 @@
|
|||
|
||||
#include "misc.h"
|
||||
#include "player.h"
|
||||
#include "sect.h"
|
||||
#include "news.h"
|
||||
#include "xy.h"
|
||||
#include "ship.h"
|
||||
#include "land.h"
|
||||
#include "plane.h"
|
||||
#include "nat.h"
|
||||
#include "nsc.h"
|
||||
#include "file.h"
|
||||
#include "commands.h"
|
||||
#include "optlist.h"
|
||||
#include "empobj.h"
|
||||
|
||||
static void scuttle_land(struct lndstr *);
|
||||
|
||||
union item_u {
|
||||
struct shpstr ship;
|
||||
struct plnstr plane;
|
||||
struct lndstr land;
|
||||
};
|
||||
|
||||
int
|
||||
scut(void)
|
||||
{
|
||||
struct nstr_item ni;
|
||||
union item_u item;
|
||||
union empobj_storage item;
|
||||
int type;
|
||||
struct mchrstr *mp;
|
||||
char *p;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue