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

actofgod: Factor report_divine_gift() out of give()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-02-03 12:24:32 +01:00
parent 004c4d0f23
commit 2f475a54dc
3 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include <config.h>
#include "actofgod.h"
#include "commands.h"
#include "item.h"
#include "news.h"
@ -74,23 +75,8 @@ give(void)
m = n + amt;
sect.sct_item[ip->i_uid] = m;
putsect(&sect);
if (sect.sct_own != 0 && sect.sct_own != player->cnum && m != n) {
if (m > n) {
if (opt_GODNEWS
&& getnatp(sect.sct_own)->nat_stat != STAT_GOD)
nreport(player->cnum, N_GIFT, sect.sct_own, 1);
wu(0, sect.sct_own, "%s gave you %d %s in %s\n",
cname(player->cnum), m - n, ip->i_name,
xyas(sect.sct_x, sect.sct_y, sect.sct_own));
} else {
if (opt_GODNEWS
&& getnatp(sect.sct_own)->nat_stat != STAT_GOD)
nreport(sect.sct_own, N_TAKE, player->cnum, 1);
wu(0, sect.sct_own, "%s stole %d %s from %s\n",
cname(player->cnum), n - m, ip->i_name,
xyas(sect.sct_x, sect.sct_y, sect.sct_own));
}
}
report_divine_gift(sect.sct_own, ip, m - n,
xyas(sect.sct_x, sect.sct_y, sect.sct_own));
if (m - n != amt)
pr("Only %d %s in %s\n", abs(m - n),
m - n >= 0 ? "given" : "taken",