empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(nxtitemp, trade_getitem, trade_desc, trade_check_item_ok, nxtitem,

Browse source 
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:
Ron Koenderink 2006-07-07 15:15:43 +00:00
parent 9e75e5e009
commit 79ee88f7c6
29 changed files with 191 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/commands/stop.c
View file

@ -38,20 +38,10 @@
#include "misc.h"
#include "player.h"
#include "xy.h"
#include "sect.h"
#include "nsc.h"
#include "nat.h"
#include "path.h"
#include "file.h"
#include "commands.h"
union item_u {
struct genitem gen;
struct shpstr ship;
struct plnstr plane;
struct lndstr land;
struct nukstr nuke;
};
#include "empobj.h"
static int start_stop(int);
static int start_stop_sector(char *, int);
@ -59,7 +49,7 @@ static void start_stop_hdr(int);
static void proff(int);
static int start_stop_unit(int, char *, int);
static void start_stop_unit_hdr(int);
static char *unit_type_name(union item_u *);
static char *unit_type_name(union empobj_storage *);
int
start(void)
@ -167,7 +157,7 @@ proff(int off)
static int
start_stop_unit(int type, char *arg, int off)
{
union item_u unit;
union empobj_storage unit;
int nunit;
struct nstr_item nstr;
@ -211,7 +201,7 @@ start_stop_unit_hdr(int off)
}
static char *
unit_type_name(union item_u *unit)
unit_type_name(union empobj_storage *unit)
{
int type = unit->gen.type;