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

Make selector terr do the right thing for deities

Browse source 
Commit db1ac2ed (v4.3.6) introduced a separate territory for deities,
and made the territory command use it by default for deities.  Deities
can still access the old default territory as territory number 0.

Selectors terr, terr0 (alias for terr), terr1, terr2, terr3 remained
unchanged, and a new selector dterr was created to let deities access
the deity territory.

Make selector terr virtual, so that it can do "the right thing", just
like the territory command: select territory 0 for mortals, and the
deity territory for deities.

Unfortunately, this requires us to switch xdump to use terr0 instead
of terr, because otherwise the deity xdump would contain the deity
territory twice, and territory 0 not at all.
This commit is contained in:
Markus Armbruster 2008-07-11 07:44:02 -04:00
parent 7a06a58bec
commit 89d168cd65
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
info/Selector.t
View file

@ -42,11 +42,12 @@ designation/infrastructure
.L effic .L effic
.L mobil .L mobil
.L terr .L terr
alias for terr0 (mortal player) or dterr (deity)
.L terr0 .L terr0
alias for terr
.L terr1 .L terr1
.L terr2 .L terr2
.L terr3 .L terr3
.L dterr
.L timestamp .L timestamp
.L fallout .L fallout
.L road .L road

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

@ -47,6 +47,7 @@
static void *nsc_ver(struct valstr *, struct natstr *, void *); static void *nsc_ver(struct valstr *, struct natstr *, void *);
static void *nsc_ver_maxnoc(struct valstr *, struct natstr *, void *); static void *nsc_ver_maxnoc(struct valstr *, struct natstr *, void *);
static void *nsc_sct_terr(struct valstr *, struct natstr *, void *);
static void *nsc_pln_att(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_pln_def(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_att(struct valstr *, struct natstr *, void *); static void *nsc_lnd_att(struct valstr *, struct natstr *, void *);
@ -133,8 +134,8 @@ struct castr sect_ca[] = {
{"effic", fldoff(sct_effic), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"effic", fldoff(sct_effic), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"mobil", fldoff(sct_mobil), NSC_SHORT, 0, NULL, EF_BAD, 0}, {"mobil", fldoff(sct_mobil), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"loyal", fldoff(sct_loyal), NSC_UCHAR, 0, NULL, EF_BAD, NSC_DEITY}, {"loyal", fldoff(sct_loyal), NSC_UCHAR, 0, NULL, EF_BAD, NSC_DEITY},
{"terr", fldoff(sct_terr), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"terr", 0, NSC_UCHAR, 0, nsc_sct_terr, EF_BAD, NSC_EXTRA},
{"terr0", fldoff(sct_terr), NSC_UCHAR, 0, NULL, EF_BAD, NSC_EXTRA}, {"terr0", fldoff(sct_terr), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"terr1", fldoff(sct_terr1), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"terr1", fldoff(sct_terr1), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"terr2", fldoff(sct_terr2), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"terr2", fldoff(sct_terr2), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"terr3", fldoff(sct_terr3), NSC_UCHAR, 0, NULL, EF_BAD, 0}, {"terr3", fldoff(sct_terr3), NSC_UCHAR, 0, NULL, EF_BAD, 0},
@ -756,6 +757,17 @@ nsc_ver_maxnoc(struct valstr *val, struct natstr *np, void *ptr)
return NULL; return NULL;
} }
static void *
nsc_sct_terr(struct valstr *val, struct natstr *np, void *ptr)
{
if (!np || np->nat_stat == STAT_GOD)
val->val_as.sym.off = offsetof(struct sctstr, sct_dterr);
else
val->val_as.sym.off = offsetof(struct sctstr, sct_terr);
val->val_as.sym.get = NULL;
return ptr;
}
static void * static void *
nsc_pln_def(struct valstr *val, struct natstr *np, void *ptr) nsc_pln_def(struct valstr *val, struct natstr *np, void *ptr)
{ {