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

Fold nstr_resolve_sel() into only remaining caller

Browse source 
No functional change.
This commit is contained in:
Markus Armbruster 2008-12-28 18:26:42 +01:00
parent 92208f65fe
commit dbb870fb80
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib/subs/nstr.c
View file

@ -48,7 +48,6 @@ static int nstr_is_name_of_ca(struct valstr *, struct castr *, int);
static int nstr_ca_comparable(struct castr *, int, int);
static int nstr_match_val(struct valstr *, struct castr *, int);
static struct valstr *nstr_resolve_id(struct valstr *, struct castr *, int);
static struct valstr *nstr_resolve_sel(struct valstr *, struct castr *);
static struct valstr *nstr_resolve_val(struct valstr *, int, struct castr *);
static int nstr_optype(enum nsc_type, enum nsc_type);
@ -432,31 +431,14 @@ nstr_resolve_id(struct valstr *val, struct castr *ca, int idx)
return NULL;
}
return nstr_resolve_sel(val, &ca[idx]);
}
/*
* Change VAL to resolve identifier to selector CA.
* Return VAL on success, NULL if the player is denied access to the
* selector.
* VAL must be an identifier.
*/
static struct valstr *
nstr_resolve_sel(struct valstr *val, struct castr *ca)
{
if (CANT_HAPPEN(val->val_cat != NSC_ID)) {
val->val_cat = NSC_NOCAT;
return val;
}
if ((ca->ca_flags & NSC_DEITY) && !player->god) {
if ((ca[idx].ca_flags & NSC_DEITY) && !player->god) {
pr("%.*s -- not accessible to mortals\n",
(int)val->val_as.str.maxsz, val->val_as.str.base);
val->val_cat = NSC_NOCAT;
return NULL;
}
return nstr_mksymval(val, ca, 0);
return nstr_mksymval(val, &ca[idx], 0);
}
/*