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

Don't store plane stats in struct plnstr

Browse source 
New pln_att(), pln_def(), pln_acc(), pln_range_max(), pln_load()
replace the struct plnstr members with the same names.

Make plane selectors att and def virtual.
This commit is contained in:
Markus Armbruster 2008-03-04 21:09:32 +01:00
parent d1a193ff07
commit ffc5d0cfd7
15 changed files with 111 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/global/nsc.c
View file

@ -46,6 +46,8 @@
#include "product.h"
static void *nsc_ver(struct valstr *, natid, void *);
static void *nsc_pln_att(struct valstr *, natid, void *);
static void *nsc_pln_def(struct valstr *, natid, void *);
/* Ugly hack to improve legibility by avoid long lines */
#define fldoff(fld) offsetof(CURSTR, fld)
@ -282,8 +284,6 @@ struct castr plane_ca[] = {
{"range", fldoff(pln_range), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"ship", fldoff(pln_ship), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"land", fldoff(pln_land), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"att", fldoff(pln_att), NSC_INT, 0, NULL, EF_BAD, NSC_EXTRA},
{"def", fldoff(pln_def), NSC_INT, 0, NULL, EF_BAD, NSC_EXTRA},
{"harden", fldoff(pln_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"nuketype", fldoff(pln_nuketype), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"flags", fldoff(pln_flags), NSC_CHAR, 0, NULL,
@ -292,6 +292,8 @@ struct castr plane_ca[] = {
{"timestamp", fldoff(pln_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"theta", fldoff(pln_theta), NSC_FLOAT, 0, NULL, EF_BAD, 0},
{"att", 0, NSC_LONG, 0, nsc_pln_att, EF_BAD, NSC_EXTRA},
{"def", 0, NSC_LONG, 0, nsc_pln_def, EF_BAD, NSC_EXTRA},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
@ -725,3 +727,17 @@ nsc_ver(struct valstr *val, natid cnum, void *ptr)
val->val_as.sym.get = NULL;
return kp->km_data;
}
static void *
nsc_pln_def(struct valstr *val, natid cnum, void *ptr)
{
val->val_as.lng = pln_def(ptr);;
return NULL;
}
static void *
nsc_pln_att(struct valstr *val, natid cnum, void *ptr)
{
val->val_as.lng = pln_att(ptr);
return NULL;
}