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

Don't warn deities about capital redesignation

Browse source
This commit is contained in:
Markus Armbruster 2009-01-02 09:09:09 +01:00
parent a4b0aae1e5
commit 1c547f9b42
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/desi.c
View file

@ -44,8 +44,6 @@ desi(void)
{ {
int n; int n;
char *p; char *p;
int cap_x;
int cap_y;
int des; int des;
struct nstr_sect nstr; struct nstr_sect nstr;
struct sctstr sect; struct sctstr sect;
@ -58,8 +56,6 @@ desi(void)
if (!snxtsct(&nstr, player->argp[1])) if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN; return RET_SYN;
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
cap_x = natp->nat_xcap;
cap_y = natp->nat_ycap;
while (nxtsct(&nstr, &sect)) { while (nxtsct(&nstr, &sect)) {
if (!player->owner) if (!player->owner)
continue; continue;
@ -134,7 +130,8 @@ desi(void)
} }
sect.sct_newtype = des; sect.sct_newtype = des;
putsect(&sect); putsect(&sect);
if (sect.sct_x == cap_x && sect.sct_y == cap_y if (!player->god
&& sect.sct_x == natp->nat_xcap && sect.sct_y == natp->nat_ycap
&& des != SCT_CAPIT && des != SCT_SANCT && des != SCT_MOUNT) && des != SCT_CAPIT && des != SCT_SANCT && des != SCT_MOUNT)
pr("You have redesignated your capital!\n"); pr("You have redesignated your capital!\n");
if (opt_EASY_BRIDGES == 0) { /* may cause a bridge fall */ if (opt_EASY_BRIDGES == 0) { /* may cause a bridge fall */