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

Pass struct natstr * instead of natid to virtual selectors

Browse source 
This is because we want to define them in src/lib/global/, and code
there can't use getnatp(), because that requires
src/lib/common/file.c.  Which renders a cnum parameter pretty useless.

Virtual selectors requiring code from common/ could well come up again
in the future, but let's not worry about that now.
This commit is contained in:
Markus Armbruster 2008-03-25 21:36:52 +01:00
parent 44295e43af
commit e5ef3d4840
3 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,19 +45,19 @@
#include "nsc.h"
#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 *);
static void *nsc_lnd_att(struct valstr *, natid, void *);
static void *nsc_lnd_def(struct valstr *, natid, void *);
static void *nsc_lnd_vul(struct valstr *, natid, void *);
static void *nsc_lnd_spd(struct valstr *, natid, void *);
static void *nsc_lnd_vis(struct valstr *, natid, void *);
static void *nsc_lnd_frg(struct valstr *, natid, void *);
static void *nsc_lnd_acc(struct valstr *, natid, void *);
static void *nsc_lnd_dam(struct valstr *, natid, void *);
static void *nsc_lnd_aaf(struct valstr *, natid, void *);
static void *nsc_lchr(struct valstr *, natid, void *);
static void *nsc_ver(struct valstr *, struct natstr *, void *);
static void *nsc_pln_att(struct valstr *, struct natstr *, void *);
static void *nsc_pln_def(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_att(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_def(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_vul(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_spd(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_vis(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_frg(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_acc(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_dam(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_aaf(struct valstr *, struct natstr *, void *);
static void *nsc_lchr(struct valstr *, struct natstr *, void *);
/* Ugly hack to improve legibility by avoid long lines */
#define fldoff(fld) offsetof(CURSTR, fld)
@ -744,7 +744,7 @@ nsc_init(void)
*/
static void *
nsc_ver(struct valstr *val, natid cnum, void *ptr)
nsc_ver(struct valstr *val, struct natstr *np, void *ptr)
{
struct keymatch *kp = &configkeys[val->val_as.sym.off];
val->val_as.sym.off = 0;
@ -753,84 +753,84 @@ nsc_ver(struct valstr *val, natid cnum, void *ptr)
}
static void *
nsc_pln_def(struct valstr *val, natid cnum, void *ptr)
nsc_pln_def(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = pln_def(ptr);;
return NULL;
}
static void *
nsc_pln_att(struct valstr *val, natid cnum, void *ptr)
nsc_pln_att(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = pln_att(ptr);
return NULL;
}
static void *
nsc_lnd_att(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_att(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.dbl = lnd_att(ptr);
return NULL;
}
static void *
nsc_lnd_def(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_def(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.dbl = lnd_def(ptr);
return NULL;
}
static void *
nsc_lnd_vul(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_vul(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_vul(ptr);
return NULL;
}
static void *
nsc_lnd_spd(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_spd(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_spd(ptr);
return NULL;
}
static void *
nsc_lnd_vis(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_vis(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_vis(ptr);
return NULL;
}
static void *
nsc_lnd_frg(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_frg(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_frg(ptr);
return NULL;
}
static void *
nsc_lnd_acc(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_acc(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_acc(ptr);
return NULL;
}
static void *
nsc_lnd_dam(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_dam(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_dam(ptr);
return NULL;
}
static void *
nsc_lnd_aaf(struct valstr *val, natid cnum, void *ptr)
nsc_lnd_aaf(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.lng = lnd_aaf(ptr);
return NULL;
}
static void *
nsc_lchr(struct valstr *val, natid cnum, void *ptr)
nsc_lchr(struct valstr *val, struct natstr *np, void *ptr)
{
val->val_as.sym.get = NULL;
return lchr + ((struct lndstr *)ptr)->lnd_type;