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

edit &c: Suppress news and bulletins on no-op acts of god

Browse source 
give already suppresses when the new value equals the old one, but
edit, setresource and setsector don't.  Make them.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-22 21:33:40 +01:00
parent 3072386d8d
commit bdf7cbce38
4 changed files with 27 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/commands/setsect.c
View file

@ -103,6 +103,8 @@ setsector(void)
pr("Owner of %s changed from %s to %s.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum),
prnatid(sect.sct_own), prnatid(amt));
if (amt == sect.sct_own)
break;
if (sect.sct_own) {
wu(0, sect.sct_own,
"Sector %s taken from you by an act of %s!\n",
@ -202,18 +204,10 @@ setsector(void)
}
static void
resbenefit(natid who, int good)
resbenefit(natid who, int goodness)
{
if (!opt_GODNEWS)
return;
if (good) {
if (who)
nreport(player->cnum, N_AIDS, who, 1);
} else {
if (who)
nreport(player->cnum, N_HURTS, who, 1);
}
if (opt_GODNEWS && who && goodness)
nreport(player->cnum, goodness > 0 ? N_AIDS : N_HURTS, who, 1);
}
void
@ -221,10 +215,10 @@ resnoise(struct sctstr *sptr, char *name, int old, int new)
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
if (sptr->sct_own)
if (sptr->sct_own && new != old)
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
old, new, cname(player->cnum));
resbenefit(sptr->sct_own, (old < new));
resbenefit(sptr->sct_own, new - old);
}