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

Move realms from the nation file into a new realms file:

Browse source 
(boundstr, realmstr): Rename, new members ef_type, r_cnum, r_uid,
r_realm, r_timestamp.
(natstr): Remove member nat_b[].
(EF_REALM, realm_ca): New.
(empfile): Add it.
(ef_open_srv, ef_close_srv, main): Deal with new file.
(getrealm, putrealm): New.
(add, new, real, list_realm, sarg_getrange): Use them.
This commit is contained in:
Ron Koenderink 2006-01-13 13:18:56 +00:00
parent 04a8b84592
commit 45adbdb00e
11 changed files with 94 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/subs/fileinit.c
View file

@ -106,6 +106,7 @@ ef_open_srv(void)
failed |= !ef_open(EF_BMAP, EFF_MEM);
failed |= !ef_open(EF_COMM, 0);
failed |= !ef_open(EF_LOST, 0);
failed |= !ef_open(EF_REALM, EFF_MEM);
if (failed) {
logerror("Missing files, giving up");
exit(EXIT_FAILURE);
@ -130,4 +131,5 @@ ef_close_srv(void)
ef_close(EF_COMM);
ef_close(EF_BMAP);
ef_close(EF_LOST);
ef_close(EF_REALM);
}

11
src/lib/subs/sarg.c
View file

@ -100,6 +100,7 @@ sarg_getrange(char *str, struct range *rp)
{
long rlm;
struct natstr *np;
struct realmstr realm;
char *end;
if (*str == '#') {
@ -114,11 +115,11 @@ sarg_getrange(char *str, struct range *rp)
return 0;
} else
rlm = 0;
np = getnatp(player->cnum);
rp->lx = np->nat_b[rlm].b_xl;
rp->hx = np->nat_b[rlm].b_xh;
rp->ly = np->nat_b[rlm].b_yl;
rp->hy = np->nat_b[rlm].b_yh;
getrealm(rlm, player->cnum, &realm);
rp->lx = realm.r_xl;
rp->hx = realm.r_xh;
rp->ly = realm.r_yl;
rp->hy = realm.r_yh;
} else {
/*
* full map specification